From 3bf49fe654c8f43d688bbf00ebe239f0f654028d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Jan 14 2020 10:12:36 +0000 Subject: cleanup and own /usr/share/php/webimpress --- diff --git a/php-webimpress-http-middleware-compatibility.spec b/php-webimpress-http-middleware-compatibility.spec index 19bd1d9..12b577b 100644 --- a/php-webimpress-http-middleware-compatibility.spec +++ b/php-webimpress-http-middleware-compatibility.spec @@ -20,7 +20,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Version: 0.1.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Compatibility library for Draft PSR-15 HTTP Middleware License: BSD @@ -31,19 +31,11 @@ Source1: makesrc.sh BuildArch: noarch %if %{with_tests} BuildRequires: php(language) >= 5.4 -# remirepo:1 -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-composer(http-interop/http-middleware) > 0.1.1 with php-composer(http-interop/http-middleware) < 0.6) # For tests, from composer.json "require-dev": { # "phpunit/phpunit": "^5.7.23 || ^6.4.3" BuildRequires: phpunit6 > 6.4.3 %global phpunit %{_bindir}/phpunit6 -# remirepo:5 -%else -BuildRequires: php-composer(http-interop/http-middleware) -BuildRequires: php-composer(phpunit/phpunit) >= 5.7.23 -%global phpunit %{_bindir}/phpunit -%endif %endif # From composer.json, "require": { @@ -51,13 +43,7 @@ BuildRequires: php-composer(phpunit/phpunit) >= 5.7.23 # "http-interop/http-middleware": "^0.1.1 || ^0.2 || ^0.3 || ^0.4.1 || ^0.5", # "webimpress/composer-extra-dependency": "^0.2.2" Requires: php(language) >= 5.6 -# remirepo:1 -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Requires: (php-composer(http-interop/http-middleware) > 0.1.1 with php-composer(http-interop/http-middleware) < 0.6) -# remirepo:3 -%else -Requires: php-composer(http-interop/http-middleware) -%endif # From phpcompatinfo report for 0.1.4 # Only core @@ -120,14 +106,16 @@ exit $ret %files -# remirepo:1 -%{!?_licensedir:%global license %%doc} %license LICENSE %doc composer.json %doc *.md -%{_datadir}/php/%{pk_vendor}/%{pk_project}%{major} +%dir %{_datadir}/php/%{pk_vendor}/ + %{_datadir}/php/%{pk_vendor}/%{pk_project}%{major} %changelog +* Tue Jan 14 2020 Remi Collet - 0.1.4-2 +- own /usr/share/php/webimpress #1789783 + * Fri Jan 10 2020 Remi Collet - 0.1.4-1 - initial package