From 6ca4fa12ab5e1d07f0b709373a0e53c37ef62454 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 28 May 2019 17:17:09 +0200
Subject: v1.1.1

---
 composer.json              | 16 ++++++++++++----
 php-symfony-contracts.spec | 33 +++++++++++++++++++++++----------
 2 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/composer.json b/composer.json
index b83e7c0..f78ba69 100644
--- a/composer.json
+++ b/composer.json
@@ -23,14 +23,22 @@
         "psr/container": "^1.0",
         "symfony/polyfill-intl-idn": "^1.10"
     },
+    "replace": {
+        "symfony/cache-contracts": "self.version",
+        "symfony/event-dispatcher-contracts": "self.version",
+        "symfony/http-client-contracts": "self.version",
+        "symfony/service-contracts": "self.version",
+        "symfony/translation-contracts": "self.version"
+    },
     "suggest": {
         "psr/cache": "When using the Cache contracts",
         "psr/container": "When using the Service contracts",
-        "symfony/cache-contracts-implementation": "",
+        "psr/event-dispatcher": "When using the EventDispatcher contracts",
+        "symfony/cache-implementation": "",
         "symfony/event-dispatcher-implementation": "",
-        "symfony/http-client-contracts-implementation": "",
-        "symfony/service-contracts-implementation": "",
-        "symfony/translation-contracts-implementation": ""
+        "symfony/http-client-implementation": "",
+        "symfony/service-implementation": "",
+        "symfony/translation-implementation": ""
     },
     "autoload": {
         "psr-4": { "Symfony\\Contracts\\": "" },
diff --git a/php-symfony-contracts.spec b/php-symfony-contracts.spec
index fee1791..c076192 100644
--- a/php-symfony-contracts.spec
+++ b/php-symfony-contracts.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    d3636025e8253c6144358ec0a62773cae588395b
+%global gh_commit    b6e291a08e6b002fb56aa6f3e2a2beb6674d2b2f
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     symfony
 %global gh_project   contracts
@@ -21,7 +21,7 @@
 %global with_tests   0%{!?_without_tests:1}
 
 Name:           php-%{pk_vendor}-%{pk_project}
-Version:        1.1.0
+Version:        1.1.1
 Release:        1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist}
 Summary:        A set of abstractions extracted out of the Symfony
 
@@ -63,11 +63,12 @@ Requires:       php(language) >= 7.1.3
 # From composer.json, "suggest": {
 #        "psr/cache": "When using the Cache contracts",
 #        "psr/container": "When using the Service contracts",
-#        "symfony/cache-contracts-implementation": "",
+#        "psr/event-dispatcher": "When using the EventDispatcher contracts",
+#        "symfony/cache-implementation": "",
 #        "symfony/event-dispatcher-implementation": "",
-#        "symfony/http-client-contracts-implementation": "",
-#        "symfony/service-contracts-implementation": "",
-#        "symfony/translation-contracts-implementation": ""
+#        "symfony/http-client-implementation": "",
+#        "symfony/service-implementation": "",
+#        "symfony/translation-implementation": ""
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >=8
 Recommends:    (php-composer(psr/cache)     >= 1.0  with php-composer(psr/cache)     < 2)
@@ -83,7 +84,12 @@ Requires:       php-intl
 # Autoloader
 Requires:       php-composer(fedora/autoloader)
 
-Provides:       php-composer(%{pk_vendor}/%{pk_project}) = %{version}
+Provides:       php-composer(%{pk_vendor}/%{pk_project})   = %{version}
+Provides:       php-composer(%{pk_vendor}/cache-contracts) = %{version}
+Provides:       php-composer(%{pk_vendor}/event-dispatcher-contracts) = %{version}
+Provides:       php-composer(%{pk_vendor}/http-client-contracts) = %{version}
+Provides:       php-composer(%{pk_vendor}/service-contracts) = %{version}
+Provides:       php-composer(%{pk_vendor}/translation-contracts) = %{version}
 
 
 %description
@@ -98,6 +104,10 @@ Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}/autoload.php
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
 
+for i in */composer.json */LICENSE */README.md
+do
+  mv $i $(dirname $i)_$(basename $i)
+done
 
 %build
 : Create autoloader
@@ -131,7 +141,7 @@ require_once '%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}/autoload.php';
 EOF
 
 ret=0
-for cmd in php php71 php72 php73; do
+for cmd in php php71 php72 php73 php74; do
   if which $cmd; then
     $cmd %{phpunit} \
       --no-coverage \
@@ -147,14 +157,17 @@ exit $ret
 %files
 # remirepo:1
 %{!?_licensedir:%global license %%doc}
-%license LICENSE
-%doc composer.json
+%license *LICENSE
+%doc *composer.json
 %doc *.md
 %dir %{php_home}/%{ns_vendor}/
      %{php_home}/%{ns_vendor}/%{ns_project}
 
 
 %changelog
+* Tue May 28 2019 Remi Collet <remi@remirepo.net> - 1.1.1-1
+- update to 1.1.1
+
 * Thu May 16 2019 Remi Collet <remi@remirepo.net> - 1.1.0-1
 - update to 1.1.0
 
-- 
cgit