summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2015-04-14 08:29:34 +0200
committerRemi Collet <fedora@famillecollet.com>2015-04-14 08:29:34 +0200
commit3135b441e216852e1e95b20c4a8e363ae622a684 (patch)
tree67e92d248fec63c74f6c0428424f5bab3edb50bc
parent87c65bb9569f00977a9edd3340b6ace306e23c28 (diff)
php-horde-Horde-Auth: 2.1.7
-rw-r--r--Horde_Auth-upstream.patch11
-rw-r--r--php-horde-Horde-Auth.spec12
2 files changed, 5 insertions, 18 deletions
diff --git a/Horde_Auth-upstream.patch b/Horde_Auth-upstream.patch
deleted file mode 100644
index 8cd825d..0000000
--- a/Horde_Auth-upstream.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- test/Horde/Auth/TestCase.php 2015-01-08 17:43:19.000000000 +0100
-+++ test/Horde/Auth/TestCase.php 2015-01-09 10:22:51.375634006 +0100
-@@ -21,7 +21,7 @@
- return array(
- array('aprmd5', '$apr1$11CBbKXP$AvvMGBjr81bC/NSMZIxrG.', '11CBbKXP'),
- array('crypt', '8e3IWstJmsmxs', '8e'),
-- array('crypt-blowfish', '*0OayF9ttbxIs', '*0OayF9ttbxIs'),
-+ array('crypt-blowfish', '$2lXRrxYRR396', '$2lXRrxYRR396'),
- array('crypt-des', '45MibW6/G3XEY', '45'),
- array('crypt-md5', '$1$537a3a0e$CWyLVJdQKfxbKPBv/Efzm0', '$1$537a3a0e$'),
- array('md5-base64', 'OFj2IjCsPJFfMAxmQxLGPw==', ''),
diff --git a/php-horde-Horde-Auth.spec b/php-horde-Horde-Auth.spec
index 81714ea..74a2c18 100644
--- a/php-horde-Horde-Auth.spec
+++ b/php-horde-Horde-Auth.spec
@@ -12,8 +12,8 @@
%global pear_channel pear.horde.org
Name: php-horde-Horde-Auth
-Version: 2.1.6
-Release: 1%{?dist}.1
+Version: 2.1.7
+Release: 1%{?dist}
Summary: Horde Authentication API
Group: Development/Libraries
@@ -21,9 +21,6 @@ License: LGPLv2
URL: http://pear.horde.org
Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
-# https://github.com/horde/horde/commit/00dc6c37f284d13c350af5a2e517047ac292e7e7
-Patch0: %{pear_name}-upstream.patch
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildArch: noarch
BuildRequires: php(language) >= 5.3.0
@@ -83,13 +80,11 @@ backends for the Horde authentication system.
%setup -q -c
cd %{pear_name}-%{version}
-%patch0 -p0 -b .upstream
# Don't install .po and .pot files
# Remove checksum for .mo, as we regenerate them
sed -e '/%{pear_name}.po/d' \
-e '/%{pear_name}.mo/s/md5sum=.*name=/name=/' \
- -e '/TestCase.php/s/md5sum=.*name=/name=/' \
../package.xml >%{name}.xml
touch -r ../package.xml %{name}.xml
@@ -151,6 +146,9 @@ fi
%changelog
+* Tue Apr 14 2015 Remi Collet <remi@fedoraproject.org> - 2.1.7-1
+- Update to 2.1.7
+
* Fri Jan 9 2015 Remi Collet <remi@fedoraproject.org> - 2.1.6-1.1
- add upstream patch for blowfish test