diff options
| -rw-r--r-- | composer.json | 9 | ||||
| -rw-r--r-- | php-sebastian-finder-facade2.spec | 81 |
2 files changed, 51 insertions, 39 deletions
diff --git a/composer.json b/composer.json index 75284a4..cba7b31 100644 --- a/composer.json +++ b/composer.json @@ -15,13 +15,14 @@ }, "prefer-stable": true, "require": { - "php": "^7.1", + "php": "^7.3", + "ext-ctype": "*", "theseer/fdomdocument": "^1.6", - "symfony/finder": "^2.3|^3.0|^4.0|^5.0" + "symfony/finder": "^4.1|^5.0" }, "config": { "platform": { - "php": "7.1.3" + "php": "7.3.0" }, "optimize-autoloader": true, "sort-packages": true @@ -33,7 +34,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.2" + "dev-master": "2.0-dev" } } } diff --git a/php-sebastian-finder-facade2.spec b/php-sebastian-finder-facade2.spec index 42297bf..01b2c27 100644 --- a/php-sebastian-finder-facade2.spec +++ b/php-sebastian-finder-facade2.spec @@ -1,4 +1,4 @@ -# remirepo/fedora spec file for php-phpunit-FinderFacade +# remirepo/fedora spec file for php-sebastian-finder-facade2 # # Copyright (c) 2012-2020 Remi Collet # License: CC-BY-SA @@ -6,29 +6,35 @@ # # Please, preserve the changelog entries # -%global gh_commit 167c45d131f7fc3d159f56f191a0a22228765e16 +%global gh_commit 9d3e74b845a2ce50e19b25b5f0c2718e153bee6c %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project finder-facade +# Packagist +%global pk_vendor sebastian +%global pk_project %{gh_project} +# Namespace +%global ns_vendor SebastianBergmann +%global ns_project FinderFacade +%global major 2 %global php_home %{_datadir}/php -%global pear_name FinderFacade -%global pear_channel pear.phpunit.de %global with_tests %{?_without_tests:0}%{!?_without_tests:1} -Name: php-phpunit-FinderFacade -Version: 1.2.3 +Name: php-%{pk_vendor}-%{pk_project}%{major} +Version: 2.0.0 Release: 1%{?dist} -Summary: Wrapper for Symfony Finder component +Summary: Wrapper for Symfony Finder component version %{major} License: BSD 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 -BuildRequires: php(language) >= 7.1 +BuildRequires: php(language) >= 7.3 +BuildRequires: php-ctype BuildRequires: php-fedora-autoloader-devel %if %{with_tests} -BuildRequires: %{_bindir}/phpunit +BuildRequires: phpunit9 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-composer(theseer/fdomdocument) >= 1.6 with php-composer(theseer/fdomdocument) < 2) BuildRequires: (php-composer(symfony/finder) >= 2.3 with php-composer(symfony/finder) < 6) @@ -39,25 +45,25 @@ BuildRequires: php-symfony-finder %endif # From composer.json "require": { -# "php": "^7.1", +# "php": "^7.3", +# "ext-ctype": "*", # "theseer/fdomdocument": "^1.6", -# "symfony/finder": "^2.3|^3.0|^4.0|^5.0" -Requires: php(language) >= 7.1 +# "symfony/finder": "^4.1|^5.0" +Requires: php(language) >= 7.3 +Requires: php-ctype %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Requires: (php-composer(theseer/fdomdocument) >= 1.6 with php-composer(theseer/fdomdocument) < 2) -Requires: (php-composer(symfony/finder) >= 2.3 with php-composer(symfony/finder) < 6) +Requires: (php-composer(symfony/finder) >= 4.1 with php-composer(symfony/finder) < 5) %else Requires: php-theseer-fDOMDocument -Requires: php-symfony-finder +Requires: php-symfony4-finder %endif -# From phpcompatinfo report for version 1.2.1 -Requires: php-ctype +# From phpcompatinfo report for version 2.0.0 +# none # For our autoloader Requires: php-composer(fedora/autoloader) Provides: php-composer(sebastian/finder-facade) = %{version} -# For compatibility with PEAR mode -Provides: php-pear(%{pear_channel}/%{pear_name}) = %{version} %description @@ -80,50 +86,55 @@ cat << 'EOF' | tee -a src/autoload.php [ '%{php_home}/Symfony5/Component/Finder/autoload.php', '%{php_home}/Symfony4/Component/Finder/autoload.php', - '%{php_home}/Symfony3/Component/Finder/autoload.php', - '%{php_home}/Symfony/Component/Finder/autoload.php', ], ]); EOF %install -mkdir -p %{buildroot}%{php_home}/SebastianBergmann -cp -pr src %{buildroot}%{php_home}/SebastianBergmann/FinderFacade +mkdir -p %{buildroot}%{php_home}/%{ns_vendor} +cp -pr src %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major} %if %{with_tests} %check -php -r 'require "%{buildroot}%{php_home}/SebastianBergmann/FinderFacade/autoload.php";' +php -r ' +require "%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php"; +exit (class_exists("%{ns_vendor}\\%{ns_project}\\%{ns_project}") ? 0 : 1); +' + +mkdir vendor +touch vendor/autoload.php ret=0 -for cmd in php php72 php73 php74; do +for cmd in php php73 php74; do if which $cmd; then - $cmd -d auto_prepend_file=%{buildroot}%{php_home}/SebastianBergmann/FinderFacade/autoload.php \ - %{_bindir}/phpunit --verbose tests || ret=1 + $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \ + %{_bindir}/phpunit9 --verbose tests || ret=1 fi done exit $ret %endif -%post -if [ -x %{_bindir}/pear ]; then - %{_bindir}/pear uninstall --nodeps --ignore-errors --register-only \ - %{pear_channel}/%{pear_name} >/dev/null || : -fi - - %files +# remirepo:1 %{!?_licensedir:%global license %%doc} %license LICENSE %doc README.md %doc composer.json -%dir %{php_home}/SebastianBergmann - %{php_home}/SebastianBergmann/FinderFacade +%dir %{php_home}/%{ns_vendor} + %{php_home}/%{ns_vendor}/%{ns_project}%{major} %changelog +* Mon Feb 10 2020 Remi Collet <remi@remirepo.net> - 2.0.0-1 +- update to 2.0.0 +- raise dependency on PHP 7.3 +- raise dependency on Symfony 4.1 +- rename to php-sebastian-finder-facade2 +- move to /usr/share/php/SebastianBergmann/FinderFacade2 + * Thu Jan 16 2020 Remi Collet <remi@remirepo.net> - 1.2.3-1 - update to 1.2.3 (no change) - raise dependency on PHP 7.1 |