diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | php-bartlett-php-compatinfo-db.spec | 23 |
2 files changed, 20 insertions, 5 deletions
@@ -1,5 +1,7 @@ +clog package-*.xml *.tgz +*.tar.bz2 *.tar.gz *.tar.xz *.tar.xz.asc diff --git a/php-bartlett-php-compatinfo-db.spec b/php-bartlett-php-compatinfo-db.spec index 1c0c0c5..697d3ca 100644 --- a/php-bartlett-php-compatinfo-db.spec +++ b/php-bartlett-php-compatinfo-db.spec @@ -7,12 +7,12 @@ # Please, preserve the changelog entries # # See https://github.com/llaville/php-compatinfo-db/releases -%global gh_commit e244454a619cf4200401229e06821c469807882d +%global gh_commit ff90705541e86c81b99053449b8b98841f0d4163 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151031 %global gh_owner llaville %global gh_project php-compatinfo-db -%global upstream_version 2.14.0 +%global upstream_version 2.15.0 #global upstream_prever RC1 # Namespace %global ns_vendor Bartlett @@ -20,7 +20,13 @@ # Composer %global c_vendor bartlett %global c_project php-compatinfo-db -%global with_tests 0%{!?_without_tests:1} +%if 0%{?fedora} >= 32 +# only enabled with 7.4+ +%bcond_without tests +%else +# disabled as too much issues, e.g. with symfony-polyfill +%bcond_with tests +%endif Name: php-%{c_vendor}-%{c_project} Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} @@ -78,7 +84,7 @@ BuildRequires: php-composer(fedora/autoloader) # "bartlett/phpunit-loggertestlistener": "^2.0", # "phpunit/php-timer": "^2.0" BuildRequires: php-cli -%if %{with_tests} +%if %{with tests} BuildRequires: php-composer(phpunit/phpunit) %endif @@ -143,6 +149,10 @@ Conflicts: php-bartlett-PHP-CompatInfo < 5 %patch0 -p1 -b .rpm %patch1 -p0 -b .curltls +# fix reported version +sed -e '/VERSION/s/2.14.0/%{version}/' -i src/Presentation/Console/Application.php +grep "%{version}" src/Presentation/Console/Application.php + cat << 'EOF' | tee src/autoload.php <?php /** @@ -239,7 +249,7 @@ install -D -p -m 644 data/compatinfo.sqlite %{buildroot}%{_datadir}/%{name}/comp install -D -p -m 755 bin/compatinfo-db %{buildroot}%{_bindir}/%{name} -%if %{with_tests} +%if %{with tests} %check export BARTLETT_COMPATINFO_DB=%{buildroot}%{_datadir}/%{name}/compatinfo.sqlite @@ -270,6 +280,9 @@ exit $ret %changelog +* Tue Jun 30 2020 Remi Collet <remi@remirepo.net> - 2.15.0-1 +- update to 2.15.0 + * Mon May 18 2020 Remi Collet <remi@remirepo.net> - 2.14.0-1 - update to 2.14.0 |