summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-04-16 07:33:22 +0200
committerRemi Collet <remi@remirepo.net>2018-04-16 07:33:22 +0200
commitd5d3723ad458cfa418436355d5cc45023f4f5667 (patch)
tree77f0a30dd3b422be5703b372f9f1753c939cf2ae
parentaff6105c62a6526dd00d5425467105978d68df16 (diff)
v1.6.4
-rw-r--r--composer-autoload.php21
-rw-r--r--composer.spec20
2 files changed, 21 insertions, 20 deletions
diff --git a/composer-autoload.php b/composer-autoload.php
index 6bead2e..04b2616 100644
--- a/composer-autoload.php
+++ b/composer-autoload.php
@@ -8,23 +8,10 @@ require_once $vendorDir . '/Fedora/Autoloader/autoload.php';
// Dependencies
\Fedora\Autoloader\Dependencies::required([
- [
- $vendorDir . '/Symfony4/Component/Console/autoload.php',
- $vendorDir . '/Symfony3/Component/Console/autoload.php',
- $vendorDir . '/Symfony/Component/Console/autoload.php',
- ], [
- $vendorDir . '/Symfony4/Component/Finder/autoload.php',
- $vendorDir . '/Symfony3/Component/Finder/autoload.php',
- $vendorDir . '/Symfony/Component/Finder/autoload.php',
- ], [
- $vendorDir . '/Symfony4/Component/Process/autoload.php',
- $vendorDir . '/Symfony3/Component/Process/autoload.php',
- $vendorDir . '/Symfony/Component/Process/autoload.php',
- ], [
- $vendorDir . '/Symfony4/Component/Filesystem/autoload.php',
- $vendorDir . '/Symfony3/Component/Filesystem/autoload.php',
- $vendorDir . '/Symfony/Component/Filesystem/autoload.php',
- ],
+ $vendorDir . '/Symfony/Component/Console/autoload.php',
+ $vendorDir . '/Symfony/Component/Finder/autoload.php',
+ $vendorDir . '/Symfony/Component/Process/autoload.php',
+ $vendorDir . '/Symfony/Component/Filesystem/autoload.php',
$vendorDir . '/Seld/JsonLint/autoload.php',
$vendorDir . '/Seld/PharUtils/autoload.php',
$vendorDir . '/Seld/CliPrompt/autoload.php',
diff --git a/composer.spec b/composer.spec
index 283b470..83f088e 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,11 @@
#
# Please, preserve the changelog entries
#
-%global gh_commit 88a69fda0f2187ad8714cedffd7a8872dceaa4c2
+
+# For compatibility with SCL
+%undefine __brp_mangle_shebangs
+
+%global gh_commit 86ad51e8a3c64c9782446aae740a61fc6faa2522
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_branch 1.0-dev
%global gh_owner composer
@@ -14,10 +18,11 @@
%global with_tests %{?_without_tests:0}%{!?_without_tests:1}
%global api_version 1.1.0
-%global upstream_version 1.6.3
+%global upstream_version 1.6.4
#global upstream_prever RC
-%if 0%{?fedora} >= 27
+%if 0
+# see https://forum.remirepo.net/viewtopic.php?id=3677
%global symfony_prefix php-symfony3
%else
%global symfony_prefix php-symfony
@@ -284,6 +289,15 @@ exit $ret
%changelog
+* Mon Apr 16 2018 Remi Collet <remi@remirepo.net> - 1.6.4-1
+- update to 1.6.4
+
+* Tue Feb 20 2018 Remi Collet <remi@remirepo.net> - 1.6.3-4
+- switch to Symfony2 only
+
+* Thu Feb 1 2018 Remi Collet <remi@remirepo.net> - 1.6.3-2
+- undefine __brp_mangle_shebangs (F28)
+
* Thu Feb 1 2018 Remi Collet <remi@remirepo.net> - 1.6.3-1
- Update to 1.6.3