summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2017-12-18 15:26:07 +0100
committerRemi Collet <remi@remirepo.net>2017-12-18 15:26:07 +0100
commit937c6238abeec008b227f6378f6caaaf71df7b00 (patch)
tree0d833f14dfd836a4d9a3a23a4f94f80fb4cfc196
parentcd5e577fa3898264a152dc3cd3a2aeae193ef4d6 (diff)
v1.5.6
-rw-r--r--composer.spec40
1 files changed, 21 insertions, 19 deletions
diff --git a/composer.spec b/composer.spec
index 4e13ceb..d201a74 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
#
# Please, preserve the changelog entries
#
-%global gh_commit aab6229c9a4b6731f23b36107c39f4007c290b50
+%global gh_commit 4f7f9c12753ec43f1e4629e2a71cabe81f2a4eab
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_branch 1.0-dev
%global gh_owner composer
@@ -15,9 +15,15 @@
%global api_version 1.1.0
#global prever RC
+%if 0%{?fedora} >= 27
+%global symfony_prefix php-symfony3
+%else
+%global symfony_prefix php-symfony
+%endif
+
Name: composer
-Version: 1.5.5
-Release: 2%{?dist}
+Version: 1.5.6
+Release: 1%{?dist}
Summary: Dependency Manager for PHP
Group: Development/Libraries
@@ -51,14 +57,10 @@ BuildRequires: php-composer(seld/cli-prompt) < 2
BuildRequires: php-composer(seld/cli-prompt) >= 1.0
BuildRequires: php-composer(psr/log) < 2
BuildRequires: php-composer(psr/log) >= 1.0
-BuildRequires: php-composer(symfony/console) < 4
-BuildRequires: php-composer(symfony/console) >= 2.7
-BuildRequires: php-composer(symfony/finder) < 4
-BuildRequires: php-composer(symfony/finder) >= 2.7
-BuildRequires: php-composer(symfony/filesystem) < 4
-BuildRequires: php-composer(symfony/filesystem) >= 2.7
-BuildRequires: php-composer(symfony/process) < 4
-BuildRequires: php-composer(symfony/process) >= 2.7
+BuildRequires: %{symfony_prefix}-console
+BuildRequires: %{symfony_prefix}-finder
+BuildRequires: %{symfony_prefix}-filesystem
+BuildRequires: %{symfony_prefix}-process
BuildRequires: php-zip
# From composer.json, "require-dev": {
# "phpunit/phpunit": "^4.5 || ^5.0.5",
@@ -102,14 +104,10 @@ Requires: php-composer(seld/cli-prompt) >= 1.0
Requires: php-composer(seld/cli-prompt) < 2
Requires: php-composer(psr/log) >= 1.0
Requires: php-composer(psr/log) < 2
-Requires: php-composer(symfony/console) >= 2.7
-Requires: php-composer(symfony/console) < 4
-Requires: php-composer(symfony/finder) >= 2.7
-Requires: php-composer(symfony/finder) < 4
-Requires: php-composer(symfony/process) >= 2.7
-Requires: php-composer(symfony/process) < 4
-Requires: php-composer(symfony/filesystem) >= 2.7
-Requires: php-composer(symfony/filesystem) < 4
+Requires: %{symfony_prefix}-console
+Requires: %{symfony_prefix}-finder
+Requires: %{symfony_prefix}-process
+Requires: %{symfony_prefix}-filesystem
# From composer.json, suggest
# "ext-zip": "Enabling the zip extension allows you to unzip archives, and allows gzip compression of all internet traffic",
# "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages"
@@ -262,6 +260,10 @@ exit $ret
%changelog
+* Mon Dec 18 2017 Remi Collet <remi@remirepo.net> - 1.5.6-1
+- Update to 1.5.6
+- switch to symfony package names
+
* Mon Dec 4 2017 Remi Collet <remi@remirepo.net> - 1.5.5-2
- fix csh profile script for EL-6