diff options
| author | Remi Collet <remi@remirepo.net> | 2020-12-02 10:02:44 +0100 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2020-12-02 10:02:44 +0100 |
| commit | 8ef0b0453600da96898d223fd8074f3befe15d2a (patch) | |
| tree | 4cde54a568e0fa6b4b8d16f2e19f0b82316083fd /php-horde-Horde-Service-Weather.spec | |
| parent | 3f4303fac179113cbb2e01993c43aceba4a6a4ce (diff) | |
drop patch merged upstream
Diffstat (limited to 'php-horde-Horde-Service-Weather.spec')
| -rw-r--r-- | php-horde-Horde-Service-Weather.spec | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/php-horde-Horde-Service-Weather.spec b/php-horde-Horde-Service-Weather.spec index 23fb5d1..4810594 100644 --- a/php-horde-Horde-Service-Weather.spec +++ b/php-horde-Horde-Service-Weather.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-horde-Horde-Service-Weather # -# Copyright (c) 2012-2019 Remi Collet +# Copyright (c) 2012-2020 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -11,16 +11,14 @@ %global pear_channel pear.horde.org Name: php-horde-Horde-Service-Weather -Version: 2.5.4 -Release: 7%{?dist} +Version: 2.5.5 +Release: 1%{?dist} Summary: Horde Weather Provider License: BSD URL: http://%{pear_channel} Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz -Patch0: https://patch-diff.githubusercontent.com/raw/horde/Service_Weather/pull/1.patch - BuildArch: noarch BuildRequires: gettext BuildRequires: php(language) >= 5.3.0 @@ -92,7 +90,6 @@ WorldWeatherOnline, and Google Weather. %setup -q -c cd %{pear_name}-%{version} -%patch0 -p1 -b .pr1 # Don't install .po and .pot files # Remove checksum for .mo, as we regenerate them @@ -138,7 +135,7 @@ done | tee ../%{pear_name}.lang cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g) ret=0 -for cmd in php php71 php72 php73 php74; do +for cmd in php php72 php73 php74; do if which $cmd; then $cmd %{_bindir}/phpunit --bootstrap bootstrap.php --verbose . || ret=1 fi @@ -172,6 +169,10 @@ fi %changelog +* Wed Dec 2 2020 Remi Collet <remi@remirepo.net> - 2.5.5-1 +- update to 2.5.5 +- drop patch merged upstream + * Mon Nov 18 2019 Remi Collet <remi@fedoraproject.org> - 2.5.4-7 - Fix FTBFS from Koschei, add patch for PHP 7.4 from https://github.com/horde/Service_Weather/pull/1 |