remi pushed to php-horde-Horde-Crypt-Blowfish (el6). "v 1.1.0"

notifications at fedoraproject.org notifications at fedoraproject.org
Fri May 22 07:39:22 UTC 2015


From 076efe1c0e3614fa9e2accbc8d06ac0ea1a68b21 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi at fedoraproject.org>
Date: Fri, 22 May 2015 09:39:13 +0200
Subject: v 1.1.0


diff --git a/.gitignore b/.gitignore
index 585d2d8..8c2bfd3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
-*spec~
+clog
 /Horde_Crypt_Blowfish-1.0.1.tgz
 /Horde_Crypt_Blowfish-1.0.2.tgz
+/Horde_Crypt_Blowfish-1.0.3.tgz
+/Horde_Crypt_Blowfish-1.1.0.tgz
diff --git a/php-horde-Horde-Crypt-Blowfish.spec b/php-horde-Horde-Crypt-Blowfish.spec
index 18c838f..84a0e38 100644
--- a/php-horde-Horde-Crypt-Blowfish.spec
+++ b/php-horde-Horde-Crypt-Blowfish.spec
@@ -1,10 +1,18 @@
+# remirepo/fedora spec file for php-horde-Horde-Crypt-Blowfish
+#
+# Copyright (c) 2013-2015 Remi Collet
+# License: CC-BY-SA
+# http://creativecommons.org/licenses/by-sa/4.0/
+#
+# Please, preserve the changelog entries
+#
+%{!?__pear:       %global __pear       %{_bindir}/pear}
 %{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
-%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %global pear_name    Horde_Crypt_Blowfish
 %global pear_channel pear.horde.org
 
 Name:           php-horde-Horde-Crypt-Blowfish
-Version:        1.0.2
+Version:        1.1.0
 Release:        1%{?dist}
 Summary:        Blowfish Encryption Library
 
@@ -13,9 +21,8 @@ License:        LGPLv2
 URL:            http://pear.horde.org
 Source0:        http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  php-common >= 5.3.0
+BuildRequires:  php(language) >= 5.3.0
 BuildRequires:  php-pear(PEAR) >= 1.7.0
 BuildRequires:  php-hash
 BuildRequires:  php-mcrypt
@@ -25,18 +32,19 @@ BuildRequires:  php-pear(%{pear_channel}/Horde_Test) >= 2.1.0
 
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
-Requires:       php-common >= 5.3.0
+Requires:       php(language) >= 5.3.0
 Requires:       php-hash
 Requires:       php-mcrypt
 Requires:       php-openssl
 Requires:       php-channel(%{pear_channel})
 Requires:       php-pear(PEAR) >= 1.7.0
 Requires:       php-pear(%{pear_channel}/Horde_Exception) >= 2.0.0
-Conflicts:      php-pear(%{pear_channel}/Horde_Exception) >= 3.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Exception) <  3.0.0
 Requires:       php-pear(%{pear_channel}/Horde_Support) >= 2.0.0
-Conflicts:      php-pear(%{pear_channel}/Horde_Support) >= 3.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Support) <  3.0.0
 
 Provides:       php-pear(%{pear_channel}/%{pear_name}) = %{version}
+Provides:       php-composer(horde/horde-crypt-blowfish) = %{version}
 
 
 %description
@@ -68,10 +76,7 @@ install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 %check
 cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g)
-phpunit\
-    -d include_path=%{buildroot}%{pear_phpdir}:.:%{pear_phpdir} \
-    -d date.timezone=UTC \
-    .
+phpunit .
 
 
 %post
@@ -86,7 +91,6 @@ fi
 
 
 %files
-%defattr(-,root,root,-)
 %doc %{pear_docdir}/%{pear_name}
 %{pear_xmldir}/%{name}.xml
 # dir also owned by Horde_Crypt which is not required
@@ -97,6 +101,10 @@ fi
 
 
 %changelog
+* Fri May 22 2015 Remi Collet <remi at fedoraproject.org> - 1.1.0-1
+- Update to 1.1.0
+- add provides php-composer(horde/horde-crypt-blowfish)
+
 * Wed Jan  9 2013 Remi Collet <RPMS at FamilleCollet.com> - 1.0.2-1
 - Update to 1.0.2 for remi repo
 
diff --git a/sources b/sources
index 901b4b0..118b18b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5709c2b5cdadd59f33720c2e8ac98c31  Horde_Crypt_Blowfish-1.0.2.tgz
+c483a4f3191d1454fd6329a0946b0abc  Horde_Crypt_Blowfish-1.1.0.tgz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/php-horde-Horde-Crypt-Blowfish.git/commit/?h=el6&id=076efe1c0e3614fa9e2accbc8d06ac0ea1a68b21


More information about the scm-commits mailing list