[php-phpunit-diff] update to 1.2.0 - run test suite during build - generate autoload.php for compatibility - fix licens

Remi Collet remi at fedoraproject.org
Fri Oct 3 10:43:06 UTC 2014


commit 503fb99d572366721e9e943049ca09cd07c33f2f
Author: Remi Collet <remi at fedoraproject.org>
Date:   Fri Oct 3 12:42:54 2014 +0200

    update to 1.2.0
    - run test suite during build
    - generate autoload.php for compatibility
    - fix license handling

 .gitignore            |    1 +
 php-phpunit-diff.spec |   29 ++++++++++++++++++++++-------
 sources               |    2 +-
 3 files changed, 24 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d1c096b..e0d3414 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ clog
 php-phpunit-diff.spec~
 /Diff-1.1.0.tgz
 /diff-1.1.0.tar.gz
+/diff-1.2.0.tar.gz
diff --git a/php-phpunit-diff.spec b/php-phpunit-diff.spec
index cb4fd44..e4e918a 100644
--- a/php-phpunit-diff.spec
+++ b/php-phpunit-diff.spec
@@ -6,19 +6,23 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    1e091702a5a38e6b4c1ba9ca816e3dd343df2e2d
+%global bootstrap    0
+%global gh_commit    5843509fed39dee4b356a306401e9dd1a931fec7
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sebastianbergmann
 %global gh_project   diff
 %global php_home     %{_datadir}/php/SebastianBergmann
 %global pear_name    Diff
 %global pear_channel pear.phpunit.de
-# Circular dependency with phpunit
+%if %{bootstrap}
 %global with_tests   %{?_with_tests:1}%{!?_with_tests:0}
+%else
+%global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
+%endif
 
 Name:           php-phpunit-diff
-Version:        1.1.0
-Release:        6%{?dist}
+Version:        1.2.0
+Release:        1%{?dist}
 Summary:        Diff implementation
 
 Group:          Development/Libraries
@@ -28,8 +32,9 @@ Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit
 
 BuildArch:      noarch
 BuildRequires:  php(language) >= 5.3.3
+BuildRequires:  %{_bindir}/phpab
 %if %{with_tests}
-BuildRequires:  %{_bindir}/phpunit
+BuildRequires:  php-phpunit-PHPUnit >= 4.2
 %endif
 
 # from composer.json
@@ -56,7 +61,9 @@ Diff implementation.
 
 
 %build
-# Empty build section, most likely nothing required.
+phpab \
+  --output   src/autoload.php \
+  src
 
 
 %install
@@ -80,13 +87,21 @@ fi
 
 
 %files
-%doc LICENSE README.md composer.json
+%{!?_licensedir:%global license %%doc}
+%license LICENSE
+%doc README.md composer.json
 
 %dir %{php_home}
 %{php_home}/%{pear_name}
 
 
 %changelog
+* Fri Oct  3 2014 Remi Collet <remi at fedoraproject.org> - 1.2.0-1
+- update to 1.2.0
+- run test suite during build
+- generate autoload.php for compatibility
+- fix license handling
+
 * Wed Jun 25 2014 Remi Collet <remi at fedoraproject.org> - 1.1.0-6
 - composer dependencies
 
diff --git a/sources b/sources
index 093ddd1..6fc69d2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-17638687c9ee3950bef3e0a9bda4726e  diff-1.1.0.tar.gz
+948610ad2602247796a1751f2892c6ae  diff-1.2.0.tar.gz


More information about the scm-commits mailing list