remi pushed to php-horde-Horde-Routes (epel7). "Update to 2.0.4 (..more)"

notifications at fedoraproject.org notifications at fedoraproject.org
Wed Apr 29 08:27:20 UTC 2015


>From 0543a891bcf2e6bd63b16af48870bdf72f57af8a Mon Sep 17 00:00:00 2001
From: Remi Collet <remi at fedoraproject.org>
Date: Wed, 29 Apr 2015 10:27:04 +0200
Subject: Update to 2.0.4

- add provides php-composer(horde/horde-routes)

diff --git a/.gitignore b/.gitignore
index c9641ae..15a8f9f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
-*spec~
+clog
 /Horde_Routes-2.0.1.tgz
 /Horde_Routes-2.0.2.tgz
+/Horde_Routes-2.0.3.tgz
+/Horde_Routes-2.0.4.tgz
diff --git a/php-horde-Horde-Routes.spec b/php-horde-Horde-Routes.spec
index cfff8db..2e093b0 100644
--- a/php-horde-Horde-Routes.spec
+++ b/php-horde-Horde-Routes.spec
@@ -1,11 +1,19 @@
+# spec file for php-horde-Horde-Routes
+#
+# 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_Routes
 %global pear_channel pear.horde.org
 
 Name:           php-horde-Horde-Routes
-Version:        2.0.2
-Release:        2%{?dist}
+Version:        2.0.4
+Release:        1%{?dist}
 Summary:        Horde Routes URL mapping system
 
 Group:          Development/Libraries
@@ -13,9 +21,8 @@ License:        BSD
 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-channel(%{pear_channel})
 # To run unit tests
@@ -23,20 +30,21 @@ BuildRequires:  php-pear(%{pear_channel}/Horde_Test) >= 2.1.0
 
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
-Requires:       php-pear(PEAR) >= 1.7.0
-Requires:       php-common >= 5.3.0
+Requires:       php(language) >= 5.3.0
 Requires:       php-pcre
 Requires:       php-spl
 # note xml extension provided by php-common and not php-xml
 # but this will change in a near futur
 Requires:       php-xml
+Requires:       php-pear(PEAR) >= 1.7.0
 Requires:       php-channel(%{pear_channel})
 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_Util) >= 2.0.0
-Conflicts:      php-pear(%{pear_channel}/Horde_Util) >= 3.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Util) <  3.0.0
 
 Provides:       php-pear(%{pear_channel}/%{pear_name}) = %{version}
+Provides:       php-composer(horde/horde-routes) = %{version}
 
 
 %description
@@ -71,10 +79,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
@@ -89,7 +94,6 @@ fi
 
 
 %files
-%defattr(-,root,root,-)
 %doc %{pear_docdir}/%{pear_name}
 %{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/Horde/Routes
@@ -97,6 +101,10 @@ fi
 
 
 %changelog
+* Tue Apr 28 2015 Remi Collet <remi at fedoraproject.org> - 2.0.4-1
+- Update to 2.0.4
+- add provides php-composer(horde/horde-routes)
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index 82c806a..3c70081 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e5dee754c112aef9dfd8ae0cef1b9d63  Horde_Routes-2.0.2.tgz
+155c3b63ec033e3909e573ce9cc35ba1  Horde_Routes-2.0.4.tgz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/php-horde-Horde-Routes.git/commit/?h=epel7&id=0543a891bcf2e6bd63b16af48870bdf72f57af8a


More information about the scm-commits mailing list