summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json8
-rw-r--r--php-phar-io-manifest2.spec56
2 files changed, 34 insertions, 30 deletions
diff --git a/composer.json b/composer.json
index de14831..3ccfc7e 100644
--- a/composer.json
+++ b/composer.json
@@ -23,10 +23,11 @@
"issues": "https://github.com/phar-io/manifest/issues"
},
"require": {
- "php": "^5.6 || ^7.0",
+ "php": "^7.2",
"ext-dom": "*",
"ext-phar": "*",
- "phar-io/version": "2.0.0"
+ "ext-xmlwriter": "*",
+ "phar-io/version": "^3.0.1"
},
"autoload": {
"classmap": [
@@ -35,8 +36,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.0.x-dev"
+ "dev-master": "2.0.x-dev"
}
}
}
-
diff --git a/php-phar-io-manifest2.spec b/php-phar-io-manifest2.spec
index 814e835..1e59eb5 100644
--- a/php-phar-io-manifest2.spec
+++ b/php-phar-io-manifest2.spec
@@ -1,13 +1,13 @@
-# remirepo/fedora spec file for php-phar-io-manifest
+# remirepo/fedora spec file for php-phar-io-manifest2
#
-# Copyright (c) 2017-2018 Remi Collet
+# Copyright (c) 2017-2020 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
# Please, preserve the changelog entries
#
%global bootstrap 0
-%global gh_commit 7761fcacf03b4d4f16e7ccb606d4879ca431fcf4
+%global gh_commit 549a9ec52cf97f20d375fca417a9eefd25f05fd5
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner phar-io
%global gh_project manifest
@@ -15,7 +15,7 @@
%global pk_project %{gh_project}
%global ns_vendor PharIo
%global ns_project Manifest
-%global major %nil
+%global major 2
%global php_home %{_datadir}/php
%if %{bootstrap}
%global with_tests 0%{?_with_tests:1}
@@ -24,7 +24,7 @@
%endif
Name: php-%{pk_vendor}-%{pk_project}%{major}
-Version: 1.0.3
+Version: 2.0.0
Release: 1%{?dist}
Summary: Component for reading phar.io manifest information
@@ -33,17 +33,15 @@ URL: https://github.com/%{gh_owner}/%{gh_project}
Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz
BuildArch: noarch
-# PHP 7 for phpunit6
-BuildRequires: php(language) >= 5.6
+BuildRequires: php(language) >= 7.2
BuildRequires: php-dom
BuildRequires: php-phar
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-composer(%{pk_vendor}/version) >= 1.0.1 with php-composer(%{pk_vendor}/version) < 3)
+BuildRequires: (php-composer(%{pk_vendor}/version) >= 3.0.1 with php-composer(%{pk_vendor}/version) < 4)
# remirepo:4
%else
-BuildRequires: php-composer(%{pk_vendor}/version) < 3
-BuildRequires: php-composer(%{pk_vendor}/version) >= 1.0.1
+BuildRequires: php-phar-io-version3 >= 3.0.1
%endif
BuildRequires: php-filter
BuildRequires: php-libxml
@@ -52,32 +50,31 @@ BuildRequires: php-spl
BuildRequires: php-xmlwriter
BuildRequires: php-fedora-autoloader-devel >= 1.0.0
%if %{with_tests}
-BuildRequires: phpunit6
+BuildRequires: phpunit8
%endif
# from composer.json
-# "php": "^5.6 || ^7.0",
+# "php": "^7.2",
# "ext-dom": "*",
# "ext-phar": "*",
-# ignore exact version, test suite passes with 1.0.1
-# "phar-io/version": "2.0.0"
-Requires: php(language) >= 5.6
+# "ext-xmlwriter": "*",
+# "phar-io/version": "^3.0.1"
+Requires: php(language) >= 7.2
Requires: php-dom
Requires: php-phar
+Requires: php-xmlwriter
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires: (php-composer(%{pk_vendor}/version) >= 1.0.1 with php-composer(%{pk_vendor}/version) < 3)
-# remirepo:4
+Requires: (php-composer(%{pk_vendor}/version) >= 3.0.1 with php-composer(%{pk_vendor}/version) < 4)
+# remirepo:3
%else
-Requires: php-composer(%{pk_vendor}/version) < 3
-Requires: php-composer(%{pk_vendor}/version) >= 1.0.1
+Requires: php-phar-io-version3 >= 3.0.1
%endif
-# from phpcompatinfo report for version 1.0.1
+# from phpcompatinfo report for version 2.0.0
Requires: php-filter
Requires: php-libxml
Requires: php-pcre
Requires: php-spl
-Requires: php-xmlwriter
# Autoloader
Requires: php-composer(fedora/autoloader)
@@ -96,11 +93,11 @@ Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php
%build
# Generate the Autoloader
-%{_bindir}/phpab --template fedora2 --output src/autoload.php src
+%{_bindir}/phpab --template fedora --output src/autoload.php src
cat << 'EOF' | tee -a src/autoload.php
\Fedora\Autoloader\Dependencies::required([
- '%{ns_vendor}/Version/autoload.php',
+ '%{ns_vendor}/Version3/autoload.php',
]);
EOF
@@ -114,14 +111,14 @@ cp -pr src %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}
%check
%if %{with_tests}
mkdir vendor
-ln -s %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php vendor/autoload.php
+touch vendor/autoload.php
: Run upstream test suite
ret=0
-for cmd in php php70 php71 php72 php73; do
+for cmd in php php72 php73 php74 php80; do
if which $cmd; then
$cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \
- %{_bindir}/phpunit6 --verbose || ret=1
+ %{_bindir}/phpunit8 --verbose || ret=1
fi
done
exit $ret
@@ -138,6 +135,13 @@ exit $ret
%changelog
+* Mon May 11 2020 Remi Collet <remi@remirepo.net> - 2.0.0-1
+- update to 2.0.0
+- rename to php-phar-io-manifest2
+- move to /usr/share/php/PharIo/Manifest2
+- raise dependency on PHP 7.2
+- switch to phpunit8
+
* Mon Jul 16 2018 Remi Collet <remi@remirepo.net> - 1.0.3-1
- update to 1.0.3
- allow phar-io/version 2.0