[php-horde-Horde-Controller] - Update to 2.0.2 - add provides php-composer(horde/horde-controller)

Remi Collet remi at fedoraproject.org
Fri Jan 9 16:53:30 UTC 2015


commit c52c29c27272effada2098c3b86959d9c8d3e180
Author: Remi Collet <remi at fedoraproject.org>
Date:   Fri Jan 9 17:53:45 2015 +0100

    - Update to 2.0.2
    - add provides php-composer(horde/horde-controller)

 .gitignore                      |    2 ++
 php-horde-Horde-Controller.spec |   27 +++++++++++++--------------
 sources                         |    2 +-
 3 files changed, 16 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 15e7095..9de4b9f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
+clog
 /Horde_Controller-2.0.1.tgz
+/Horde_Controller-2.0.2.tgz
diff --git a/php-horde-Horde-Controller.spec b/php-horde-Horde-Controller.spec
index d3c5577..a41a5ee 100644
--- a/php-horde-Horde-Controller.spec
+++ b/php-horde-Horde-Controller.spec
@@ -1,6 +1,6 @@
 # spec file for php-horde-Horde-Controller
 #
-# Copyright (c) 2012-2014 Nick Bebout, Remi Collet
+# Copyright (c) 2012-2015 Nick Bebout, Remi Collet
 #
 # License: MIT
 # https://fedoraproject.org/wiki/Licensing:MIT#Modern_Style_with_sublicense
@@ -13,8 +13,8 @@
 %global pear_channel pear.horde.org
 
 Name:           php-horde-Horde-Controller
-Version:        2.0.1
-Release:        5%{?dist}
+Version:        2.0.2
+Release:        1%{?dist}
 Summary:        Horde Controller libraries
 
 Group:          Development/Libraries
@@ -23,18 +23,18 @@ URL:            http://pear.horde.org
 Source0:        http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
 
 BuildArch:      noarch
+BuildRequires:  php(language) >= 5.3.0
 BuildRequires:  php-pear(PEAR) >= 1.7.0
-BuildRequires:  php-common >= 5.3.0
 BuildRequires:  php-channel(%{pear_channel})
 # To run unit tests
 BuildRequires:  php-pear(%{pear_channel}/Horde_Test) >= 2.1.0
 
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
-Requires:       php-common >= 5.3.0
-Requires:       php-pear(PEAR) >= 1.7.0
+Requires:       php(language) >= 5.3.0
 Requires:       php-mbstring
 Requires:       php-zlib
+Requires:       php-pear(PEAR) >= 1.7.0
 Requires:       php-channel(%{pear_channel})
 Requires:       php-pear(%{pear_channel}/Horde_Exception) >= 2.0.0
 Requires:       php-pear(%{pear_channel}/Horde_Exception) <  3.0.0
@@ -48,14 +48,14 @@ Requires:       php-pear(%{pear_channel}/Horde_Util) >= 2.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-controller) = %{version}
 
 
 %description
 This package provides the controller part of an MVC system for Horde.
 
 %prep
-%setup -q -c -T
-tar xif %{SOURCE0}
+%setup -q -c
 
 cd %{pear_name}-%{version}
 cp ../package.xml %{name}.xml
@@ -78,12 +78,8 @@ mkdir -p %{buildroot}%{pear_xmldir}
 install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 %check
-src=$(pwd)/%{pear_name}-%{version}
 cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g)
-phpunit\
-    --include-path=$src/lib \
-    -d date.timezone=UTC \
-    .
+phpunit .
 
 
 %post
@@ -98,7 +94,6 @@ fi
 
 
 %files
-%defattr(-,root,root,-)
 %doc %{pear_docdir}/%{pear_name}
 %{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/Horde/Controller
@@ -107,6 +102,10 @@ fi
 
 
 %changelog
+* Thu Jan 08 2015 Remi Collet <remi at fedoraproject.org> - 2.0.2-1
+- Update to 2.0.2
+- add provides php-composer(horde/horde-controller)
+
 * Sun Jun 08 2014 Remi Collet <remi at fedoraproject.org> - 2.0.1-5
 - fix FTBFS (include path for test)
 
diff --git a/sources b/sources
index 5903f23..411c6b1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7879473ffec7a609215cdca6c75411f9  Horde_Controller-2.0.1.tgz
+92821995e107d3f96caeb25a963ed15b  Horde_Controller-2.0.2.tgz


More information about the scm-commits mailing list