summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2017-04-28 09:13:50 +0200
committerRemi Collet <remi@remirepo.net>2017-04-28 09:13:50 +0200
commit6e8f2d8d4c19997790b6e9047fff9184d31cd60a (patch)
treee63d922b990a050b1f67088288a4e43aba93cfe4
parent435878dbf3e255adbbcbcdea4a82e72b5cc82920 (diff)
v2.0.0
-rw-r--r--composer.json9
-rw-r--r--php-sebastian-global-state2.spec96
2 files changed, 55 insertions, 50 deletions
diff --git a/composer.json b/composer.json
index 7e8849b..8f7edb3 100644
--- a/composer.json
+++ b/composer.json
@@ -11,10 +11,10 @@
}
],
"require": {
- "php": ">=5.3.3"
+ "php": "^7.0"
},
"require-dev": {
- "phpunit/phpunit": "~4.2"
+ "phpunit/phpunit": "^6.0"
},
"suggest": {
"ext-uopz": "*"
@@ -27,11 +27,14 @@
"autoload-dev": {
"classmap": [
"tests/_fixture/"
+ ],
+ "files": [
+ "tests/_fixture/SnapshotFunctions.php"
]
},
"extra": {
"branch-alias": {
- "dev-master": "1.0-dev"
+ "dev-master": "2.0-dev"
}
}
}
diff --git a/php-sebastian-global-state2.spec b/php-sebastian-global-state2.spec
index 0c0a700..d8992a1 100644
--- a/php-sebastian-global-state2.spec
+++ b/php-sebastian-global-state2.spec
@@ -1,4 +1,4 @@
-# spec file for php-sebastian-global-state
+# spec file for php-sebastian-global-state2
#
# Copyright (c) 2014-2017 Remi Collet
# License: CC-BY-SA
@@ -7,40 +7,50 @@
# Please, preserve the changelog entries
#
%global bootstrap 0
-%global gh_commit bc37d50fea7d017d3d340f230811c9f1d7280af4
+%global gh_commit e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner sebastianbergmann
%global gh_project global-state
-%global php_home %{_datadir}/php/SebastianBergmann
+%global pk_vendor sebastian
+%global pk_project %{gh_project}
+%global major 2
+%global php_home %{_datadir}/php
+%global ns_vendor SebastianBergmann
+%global ns_project GlobalState
%if %{bootstrap}
%global with_tests %{?_with_tests:1}%{!?_with_tests:0}
%else
%global with_tests %{?_without_tests:0}%{!?_without_tests:1}
%endif
-Name: php-sebastian-global-state
-Version: 1.1.1
-Release: 4%{?dist}
+Name: php-%{pk_vendor}-%{pk_project}%{major}
+Version: 2.0.0
+Release: 1%{?dist}
Summary: Snapshotting of global state
Group: Development/Libraries
License: BSD
URL: https://github.com/%{gh_owner}/%{gh_project}
-Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz
+Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-BuildRequires: php(language) >= 5.3.3
-BuildRequires: php-fedora-autoloader-devel
+BuildRequires: php(language) >= 7.0
+BuildRequires: php-reflection
+BuildRequires: php-spl
+# Autoloader
+BuildRequires: php-fedora-autoloader-devel >= 1.0.0
%if %{with_tests}
# from composer.json, "require-dev": {
-# "phpunit/phpunit": "~4.2"
-BuildRequires: php-composer(phpunit/phpunit) > 4.2
+# "phpunit/phpunit": "^6.0"
+BuildRequires: phpunit6
%endif
# from composer.json, "require": {
-# "php": ">=5.3.3"
-Requires: php(language) >= 5.3.3
+# "php": "^7.0"
+Requires: php(language) >= 7.0
+# from phpcompatinfo report for version 2.0.0
+Requires: php-reflection
+Requires: php-spl
# from composer.json, "suggest": {
# "ext-uopz": "*"
%if 0%{?fedora} > 21
@@ -49,7 +59,7 @@ Suggests: php-uopz
# Autoloader
Requires: php-composer(fedora/autoloader)
-Provides: php-composer(sebastian/global-state) = %{version}
+Provides: php-composer(%{pk_vendor}/%{pk_project}) = %{version}
%description
@@ -63,16 +73,15 @@ factored out of PHPUnit into a stand-alone component.
%build
# Generate the Autoloader
-phpab --template fedora --output src/autoload.php src
+phpab --template fedora2 --output src/autoload.php src
# For the test suite
-phpab --template fedora --output tests/autoload.php tests/_fixture/
+phpab --template fedora2 --output tests/autoload.php tests/_fixture/
%install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}%{php_home}
-cp -pr src %{buildroot}%{php_home}/GlobalState
+mkdir -p %{buildroot}%{php_home}/%{ns_vendor}
+cp -pr src %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}
%check
@@ -80,29 +89,19 @@ cp -pr src %{buildroot}%{php_home}/GlobalState
mkdir vendor
cat <<EOF | tee vendor/autoload.php
<?php
-require 'SebastianBergmann/GlobalState/autoload.php';
-require 'tests/autoload.php';
+require_once '%{ns_vendor}/%{ns_project}%{major}/autoload.php';
+require_once 'tests/autoload.php';
+require_once 'tests/_fixture/SnapshotFunctions.php';
EOF
: Run upstream test suite
-# remirepo:13
-run=0
ret=0
-if which php56; then
- php56 -d include_path=.:%{buildroot}%{_datadir}/php:%{_datadir}/php \
- %{_bindir}/phpunit || ret=1
- run=1
-fi
-if which php71; then
- php71 -d include_path=.:%{buildroot}%{_datadir}/php:%{_datadir}/php \
- %{_bindir}/phpunit || ret=1
- run=1
-fi
-if [ $run -eq 0 ]; then
-%{_bindir}/php -d include_path=.:%{buildroot}%{_datadir}/php:%{_datadir}/php \
-%{_bindir}/phpunit --verbose
-# remirepo:2
-fi
+for cmd in php php70 php71 php72; do
+ if which $cmd; then
+ $cmd -d include_path=.:%{buildroot}%{php_home}:%{php_home} \
+ %{_bindir}/phpunit6 --verbose || ret=1
+ fi
+done
exit $ret
%else
@@ -110,18 +109,21 @@ exit $ret
%endif
-%clean
-rm -rf %{buildroot}
-
-
%files
-%defattr(-,root,root,-)
-%doc LICENSE README.md composer.json
-%dir %{php_home}
-%{php_home}/GlobalState
+%{!?_licensedir:%global license %%doc}
+%license LICENSE
+%doc README.md
+%doc composer.json
+%dir %{php_home}/%{ns_vendor}
+ %{php_home}/%{ns_vendor}/%{ns_project}%{major}
%changelog
+* Fri Apr 28 2017 Remi Collet <remi@fedoraproject.org> - 2.0.0-1
+- rename to php-sebastian-global-state2
+- update to 2.0.0
+- raise dependency on PHP 7.0
+
* Fri Oct 21 2016 Remi Collet <remi@fedoraproject.org> - 1.1.1-4
- switch to fedora/autoloader