[php-phpunit-Version] - Update to 1.0.4 - fix scriptlet - drop pear compatibility provides - fix license usage

Remi Collet remi at fedoraproject.org
Sun Jan 4 08:42:05 UTC 2015


commit 3346577bd2c5872ae75249a1aa67c523484005df
Author: Remi Collet <remi at fedoraproject.org>
Date:   Sun Jan 4 09:42:09 2015 +0100

    - Update to 1.0.4
    - fix scriptlet
    - drop pear compatibility provides
    - fix license usage

 .gitignore               |    1 +
 php-phpunit-Version.spec |   37 ++++++++++++++++++++-----------------
 sources                  |    2 +-
 3 files changed, 22 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ff99cdd..83fa7c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ clog
 /Version-1.0.1.tgz
 /Version-1.0.2.tgz
 /version-1.0.3.tar.gz
+/version-1.0.4.tar.gz
diff --git a/php-phpunit-Version.spec b/php-phpunit-Version.spec
index 58c3697..cb2583d 100644
--- a/php-phpunit-Version.spec
+++ b/php-phpunit-Version.spec
@@ -1,23 +1,21 @@
 # spec file for php-phpunit-Version
 #
-# Copyright (c) 2013-2014 Remi Collet
+# Copyright (c) 2013-2015 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/3.0/
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43
+%global gh_commit    a77d9123f8e809db3fbdea15038c27a95da4058b
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sebastianbergmann
 %global gh_project   version
 %global php_home     %{_datadir}/php/SebastianBergmann/
-%global pear_name    Version
-%global pear_channel pear.phpunit.de
 %global with_tests   %{?_without_tests:0}%{!?_withou_tests:1}
 
 Name:           php-phpunit-Version
-Version:        1.0.3
-Release:        3%{?dist}
+Version:        1.0.4
+Release:        1%{?dist}
 Summary:        Managing the version number of Git-hosted PHP projects
 
 Group:          Development/Libraries
@@ -37,9 +35,9 @@ Requires:       git
 
 Provides:       php-composer(sebastian/version) = %{version}
 
-# For compatibility, to drop when no more required
-# Currently used by phpcpd and phploc
-Provides:       php-pear(%{pear_channel}/Version) = %{version}
+%if 0%{?fedora} < 21 && 0%{?rhel} < 7
+Provides:       php-pear(pear.phpunit.de/Version) = %{version}
+%endif
 
 
 %description
@@ -63,29 +61,34 @@ cp -pr src %{buildroot}%{php_home}/Version
 
 %if %{with_tests}
 %check
+# For now: No tests executed!
 cd build
 phpunit
 %endif
 
 
 %post
-%{__pear} install --nodeps --soft --force --register-only \
-    %{pear_xmldir}/%{name}.xml >/dev/null || :
-
-%postun
-if [ $1 -eq 0 ] ; then
-    %{__pear} uninstall --nodeps --ignore-errors --register-only \
-        %{pear_channel}/%{pear_name} >/dev/null || :
+if [ -x %{_bindir}/pear ]; then
+   %{_bindir}/pear uninstall --nodeps --ignore-errors --register-only \
+      pear.phpunit.de/Version >/dev/null || :
 fi
 
 
 %files
-%doc LICENSE ChangeLog.md README.md composer.json
+%{!?_licensedir:%global license %%doc}
+%license LICENSE
+%doc ChangeLog.md README.md composer.json
 %dir %{php_home}
 %{php_home}/Version
 
 
 %changelog
+* Sun Jan  4 2015 Remi Collet <remi at fedoraproject.org> - 1.0.4-1
+- Update to 1.0.4
+- fix scriptlet
+- drop pear compatibility provides
+- fix license usage
+
 * Wed Jun 25 2014 Remi Collet <remi at fedoraproject.org> - 1.0.3-3
 - composer dependencies
 
diff --git a/sources b/sources
index 3dff5ee..f12a1f3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2fa81e07307756787c469b1efdd254e5  version-1.0.3.tar.gz
+32bf909969a3902d1cc0ec167253a738  version-1.0.4.tar.gz


More information about the scm-commits mailing list