remi pushed to php-horde-Horde-Idna (f20). "- Update to 1.0.2 (..more)"

[notifications at fedoraproject.org]

>From e677b5cb76bc19db2d36bae48faafec2b6d548b3 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi at fedoraproject.org>
Date: Tue, 14 Apr 2015 18:00:45 +0200
Subject: - Update to 1.0.2 - add optional dependency on Horde_Util - drop
 dependency on true/punycode (use php-intl, bundled Punycode is only a
 fallback) - run test suite during build


diff --git a/.gitignore b/.gitignore
index 9dd21c2..b9fbfd3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
+clog
 /Horde_Idna-1.0.0.tgz
 /Horde_Idna-1.0.1.tgz
+/Horde_Idna-1.0.2.tgz
diff --git a/php-horde-Horde-Idna.spec b/php-horde-Horde-Idna.spec
index d90a346..3621ae5 100644
--- a/php-horde-Horde-Idna.spec
+++ b/php-horde-Horde-Idna.spec
@@ -2,17 +2,23 @@
 #
 # Copyright (c) 2015 Remi Collet
 # License: CC-BY-SA
-# http://creativecommons.org/licenses/by-sa/3.0/
+# 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}}
+%global bootstrap    0
 %global pear_name    Horde_Idna
 %global pear_channel pear.horde.org
+%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-Idna
-Version:        1.0.1
+Version:        1.0.2
 Release:        1%{?dist}
 Summary:        IDNA backend normalization package
 
@@ -28,20 +34,27 @@ BuildArch:      noarch
 BuildRequires:  php(language) >= 5.3.0
 BuildRequires:  php-pear(PEAR) >= 1.7.0
 BuildRequires:  php-channel(%{pear_channel})
+%if %{with_tests}
+# To run unit tests
+BuildRequires:  php-pear(%{pear_channel}/Horde_Test) >= 2.1.0
+BuildRequires:  php-intl
+%endif
 
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
+# From package.xml
 Requires:       php(language) >= 5.3.0
 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
-# optional, but not needed as true/punycode is prefered / mandatory:
-#   Net_IDNA, Net_IDNA2, mbstring
-# unbundled library:
-Requires:       php-composer(true/punycode) >= 1.0.1
+# optional
+Requires:       php-intl
+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-idna) = %{version}
 
 
 %description
@@ -52,15 +65,7 @@ Domain Names in Applications) support.
 %prep
 %setup -q -c
 cd %{pear_name}-%{version}
-
-%patch0 -p1 -b .rpm
-
-# don't install bundled library
-# don't check checksum of patched file
-sed -e '/bundle/d' \
-    -e '/Idna.php/s/md5sum="[^"]*"//' \
-    ../package.xml >%{name}.xml
-touch -r ../package.xml %{name}.xml
+mv ../package.xml %{name}.xml
 
 
 %build
@@ -80,6 +85,15 @@ mkdir -p %{buildroot}%{pear_xmldir}
 install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 
+%check
+%if %{with_tests}
+cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g)
+phpunit .
+%else
+: Test disabled, bootstrap build
+%endif
+
+
 %post
 %{__pear} install --nodeps --soft --force --register-only \
     %{pear_xmldir}/%{name}.xml >/dev/null || :
@@ -96,9 +110,17 @@ fi
 %{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/Horde/Idna/
 %{pear_phpdir}/Horde/Idna.php
+%{pear_testdir}/%{pear_name}
 
 
 %changelog
+* Tue Apr 14 2015 Remi Collet <remi at fedoraproject.org> - 1.0.2-1
+- Update to 1.0.2
+- add optional dependency on Horde_Util
+- drop dependency on true/punycode
+  (use php-intl, bundled Punycode is only a fallback)
+- run test suite during build
+
 * Wed Jan 07 2015 Remi Collet <remi at fedoraproject.org> - 1.0.1-1
 - Update to 1.0.1
 
diff --git a/sources b/sources
index a8d3985..e434f5d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fc432437fde1f48ae7df124ffb64cbde  Horde_Idna-1.0.1.tgz
+a5416e27de435f49ee32b0bf0f6ce9a5  Horde_Idna-1.0.2.tgz
-- 
cgit v0.10.2


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