remi pushed to php-phpunit-environment (epel7). "update to 1.2.2 (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue Apr 7 05:39:59 UTC 2015
>From 926208c95dd3d801d9bfb60f929bb002ab123bac Mon Sep 17 00:00:00 2001
From: Remi Collet <remi at fedoraproject.org>
Date: Fri, 3 Apr 2015 14:51:16 +0200
Subject: update to 1.2.2
(cherry picked from commit eced6698c70faab1d557815a99934b8b325b4d9b)
diff --git a/.gitignore b/.gitignore
index ccf4888..8e4c92a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ clog
/environment-1.1.0.tar.gz
/environment-1.2.0.tar.gz
/environment-1.2.1.tar.gz
+/environment-1.2.2.tar.gz
diff --git a/php-phpunit-environment.spec b/php-phpunit-environment.spec
index e082341..a11482e 100644
--- a/php-phpunit-environment.spec
+++ b/php-phpunit-environment.spec
@@ -1,17 +1,17 @@
# spec file for php-phpunit-environment
#
-# Copyright (c) 2014 Remi Collet
+# Copyright (c) 2014-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
#
%global bootstrap 0
-%global gh_commit 6e6c71d918088c251b181ba8b3088af4ac336dd7
+%global gh_commit 5a8c7d31914337b69923db26c4221b81ff5a196e
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner sebastianbergmann
%global gh_project environment
-%global php_home %{_datadir}/php/SebastianBergmann
+%global php_home %{_datadir}/php
%if %{bootstrap}
%global with_tests %{?_with_tests:1}%{!?_with_tests:0}
%else
@@ -19,7 +19,7 @@
%endif
Name: php-phpunit-environment
-Version: 1.2.1
+Version: 1.2.2
Release: 1%{?dist}
Summary: Handle HHVM/PHP environments
@@ -32,10 +32,12 @@ BuildArch: noarch
BuildRequires: php(language) >= 5.3.3
BuildRequires: %{_bindir}/phpab
%if %{with_tests}
-BuildRequires: %{_bindir}/phpunit
+# from composer.json, "require-dev": {
+# "phpunit/phpunit": "~4.4"
+BuildRequires: php-composer(phpunit/phpunit) >= 4.4
%endif
-# from composer.json
+# from composer.json, "require": {
# "php": ">=5.3.3"
Requires: php(language) >= 5.3.3
@@ -50,40 +52,43 @@ has runtime-specific (PHP / HHVM) execution paths.
%prep
%setup -q -n %{gh_project}-%{gh_commit}
+# Restore PSR-0 tree
+mkdir SebastianBergmann
+mv src SebastianBergmann/Environment
+
%build
# Generate the Autoloader
-phpab --output src/autoload.php src
+%{_bindir}/phpab \
+ --output SebastianBergmann/Environment/autoload.php \
+ SebastianBergmann/Environment
%install
-mkdir -p %{buildroot}%{php_home}
-cp -pr src %{buildroot}%{php_home}/Environment
+mkdir -p %{buildroot}%{php_home}/SebastianBergmann
+cp -pr SebastianBergmann/Environment \
+ %{buildroot}%{php_home}/SebastianBergmann/Environment
%if %{with_tests}
%check
-if [ -d /usr/share/php/PHPUnit ]
-then
- # Hack PHPUnit 4 autoloader to not use system library
- mkdir PHPUnit
- sed -e 's:SebastianBergmann/Environment:src:' \
- -e 's:dirname(__FILE__):"/usr/share/php/PHPUnit":' \
- /usr/share/php/PHPUnit/Autoload.php \
- >PHPUnit/Autoload.php
-fi
-
-phpunit --bootstrap src/autoload.php
+%{_bindir}/phpunit --bootstrap SebastianBergmann/Environment/autoload.php
%endif
%files
-%doc LICENSE README.md composer.json
-%dir %{php_home}
-%{php_home}/Environment
+%{!?_licensedir:%global license %%doc}
+%license LICENSE
+%doc README.md composer.json
+%dir %{php_home}/SebastianBergmann
+ %{php_home}/SebastianBergmann/Environment
%changelog
+* Fri Apr 3 2015 Remi Collet <remi at fedoraproject.org> - 1.2.2-1
+- update to 1.2.2
+- fix license handling
+
* Tue Dec 2 2014 Remi Collet <remi at fedoraproject.org> - 1.2.1-1
- update to 1.2.1
diff --git a/sources b/sources
index dde232a..353108e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-78cc91f02103424d1ef46d58fb67d2ab environment-1.2.1.tar.gz
+879f8b8297b3087d0d08e07121f736d0 environment-1.2.2.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/php-phpunit-environment.git/commit/?h=epel7&id=926208c95dd3d801d9bfb60f929bb002ab123bac
More information about the scm-commits
mailing list