diff options
| -rw-r--r-- | Horde_Service_Weather-upstream.patch | 24 | ||||
| -rw-r--r-- | php-horde-Horde-Service-Weather.spec | 9 |
2 files changed, 4 insertions, 29 deletions
diff --git a/Horde_Service_Weather-upstream.patch b/Horde_Service_Weather-upstream.patch deleted file mode 100644 index 2c8e568..0000000 --- a/Horde_Service_Weather-upstream.patch +++ /dev/null @@ -1,24 +0,0 @@ -From ab2c8277d5e47c171d1354a774a6e1930d22a151 Mon Sep 17 00:00:00 2001 -From: Michael J Rubinsky <mrubinsk@horde.org> -Date: Sat, 29 Aug 2015 00:50:05 -0400 -Subject: [PATCH] These tests are tz sensitive. Disable for now. - ---- - framework/Service_Weather/test/Horde/Service/Weather/Wwov2Test.php | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/framework/Service_Weather/test/Horde/Service/Weather/Wwov2Test.php b/framework/Service_Weather/test/Horde/Service/Weather/Wwov2Test.php -index 997fdfc..1fa6496 100644 ---- a/framework/Service_Weather/test/Horde/Service/Weather/Wwov2Test.php -+++ b/framework/Service_Weather/test/Horde/Service/Weather/Wwov2Test.php -@@ -65,8 +65,8 @@ public function testGetStation() - $weather->getCurrentConditions('clayton,nj'); - $station = $weather->getStation(); - -- $this->assertEquals('2015-08-28 06:05:48', (string)$station->sunrise); -- $this->assertEquals('2015-08-28 19:24:47', (string)$station->sunset); -+ //$this->assertEquals('2015-08-28 06:05:48', (string)$station->sunrise); -+ //$this->assertEquals('2015-08-28 19:24:47', (string)$station->sunset); - $this->assertEquals('Boston, Massachusetts', $station->name); - $this->assertEquals('-04:00', $station->getOffset()); - } diff --git a/php-horde-Horde-Service-Weather.spec b/php-horde-Horde-Service-Weather.spec index b86b5c0..a9aff5d 100644 --- a/php-horde-Horde-Service-Weather.spec +++ b/php-horde-Horde-Service-Weather.spec @@ -11,7 +11,7 @@ %global pear_channel pear.horde.org Name: php-horde-Horde-Service-Weather -Version: 2.2.0 +Version: 2.3.0 Release: 1%{?dist} Summary: Horde Weather Provider @@ -20,8 +20,6 @@ License: BSD URL: http://%{pear_channel} Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz -Patch0: %{pear_name}-upstream.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: gettext @@ -73,14 +71,12 @@ WorldWeatherOnline, and Google Weather. %setup -q -c cd %{pear_name}-%{version} -%patch0 -p3 -b .upstream # Don't install .po and .pot files # Remove checksum for .mo, as we regenerate them sed -e '/%{pear_name}.po/d' \ -e '/Horde_Other.po/d' \ -e '/%{pear_name}.mo/s/md5sum="[^"]*"//' \ - -e '/Wwov2Test.php/s/md5sum="[^"]*"//' \ ../package.xml >%{name}.xml touch -r ../package.xml %{name}.xml @@ -150,6 +146,9 @@ fi %changelog +* Wed Oct 21 2015 Remi Collet <remi@fedoraproject.org> - 2.3.0-1 +- Update to 2.3.0 + * Sun Aug 30 2015 Remi Collet <remi@fedoraproject.org> - 2.2.0-1 - Update to 2.2.0 |