remi pushed to php-horde-Horde-Date (f20). "v 2.1.0 (..more)"

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


From 711caa18824f827dcc579b7d7fb58a480e1a7552 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi at fedoraproject.org>
Date: Fri, 22 May 2015 09:50:38 +0200
Subject: v 2.1.0

(cherry picked from commit fc11132df80579a2b7a2889bdc90f19805fe061c)

diff --git a/.gitignore b/.gitignore
index 75d79bc..8119574 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-*spec~
+clog
 /Horde_Date-1.0.11.tgz
 /Horde_Date-2.0.1.tgz
 /Horde_Date-2.0.2.tgz
@@ -12,3 +12,5 @@
 /Horde_Date-2.0.10.tgz
 /Horde_Date-2.0.11.tgz
 /Horde_Date-2.0.12.tgz
+/Horde_Date-2.0.13.tgz
+/Horde_Date-2.1.0.tgz
diff --git a/php-horde-Horde-Date.spec b/php-horde-Horde-Date.spec
index 1640521..3732d6b 100644
--- a/php-horde-Horde-Date.spec
+++ b/php-horde-Horde-Date.spec
@@ -1,6 +1,6 @@
-# spec file for php-horde-Horde-Date
+# remirepo/fedora spec file for php-horde-Horde-Crypt-Blowfish
 #
-# 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
@@ -9,14 +9,17 @@
 #
 %{!?__pear:       %global __pear       %{_bindir}/pear}
 %{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
+%global bootstrap    0
 %global pear_name    Horde_Date
 %global pear_channel pear.horde.org
-
-# Can run test because of circular dependency with Horde_Test
+%if %{bootstrap}
 %global with_tests   %{?_with_tests:1}%{!?_with_tests:0}
+%else
+%global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
+%endif
 
 Name:           php-horde-Horde-Date
-Version:        2.0.12
+Version:        2.1.0
 Release:        1%{?dist}
 Summary:        Horde Date package
 
@@ -33,6 +36,7 @@ BuildRequires:  gettext
 %if %{with_tests}
 # To run unit tests
 BuildRequires:  php-pear(%{pear_channel}/Horde_Test) >= 2.1.0
+BuildRequires:  php-pear(%{pear_channel}/Horde_Icalendar) >= 2.0.0
 %endif
 
 Requires(post): %{__pear}
@@ -45,7 +49,7 @@ Requires:       php-pear(PEAR) >= 1.7.0
 Requires:       php-channel(%{pear_channel})
 Requires:       php-pear(%{pear_channel}/Horde_Nls) >= 2.0.0
 Requires:       php-pear(%{pear_channel}/Horde_Nls) <  3.0.0
-Requires:       php-pear(%{pear_channel}/Horde_Translation) >= 2.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Translation) >= 2.2.0
 Requires:       php-pear(%{pear_channel}/Horde_Translation) <  3.0.0
 Requires:       php-pear(%{pear_channel}/Horde_Exception) >= 2.0.0
 Requires:       php-pear(%{pear_channel}/Horde_Exception) <  3.0.0
@@ -54,6 +58,7 @@ Requires:       php-pear(%{pear_channel}/Horde_Util) <  3.0.0
 # Optional and omited to avoid circular dependency: Horde_Icalendar
 
 Provides:       php-pear(%{pear_channel}/%{pear_name}) = %{version}
+Provides:       php-composer(horde/horde-date) = %{version}
 
 
 %description
@@ -104,12 +109,8 @@ done | tee ../%{pear_name}.lang
 
 %check
 %if %{with_tests}
-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 .
 %else
 : Test disabled, missing '--with tests' option.
 %endif
@@ -136,6 +137,12 @@ fi
 
 
 %changelog
+* Fri May 22 2015 Remi Collet <remi at fedoraproject.org> - 2.1.0-1
+- Update to 2.1.0
+- add provides php-composer(horde/horde-date)
+- raise dependency on Horde_Translation 2.2.0
+- enable test suite
+
 * Mon Aug 04 2014 Remi Collet <remi at fedoraproject.org> - 2.0.12-1
 - Update to 2.0.12
 
diff --git a/sources b/sources
index e2c52df..62958d4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a8661348156194849d96069bd969be00  Horde_Date-2.0.12.tgz
+2e65cde8fc9e994b9f7a792b1073a2ae  Horde_Date-2.1.0.tgz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/php-horde-Horde-Date.git/commit/?h=f20&id=711caa18824f827dcc579b7d7fb58a480e1a7552


More information about the scm-commits mailing list