Request 2275 (accepted)

composer.spec Changed

@@ -1,156 +1,82 @@
-# remirepo/fedora spec file for composer
+# spec file for composer
 #
-# Copyright (c) 2015-2018 Remi Collet
+# Copyright (c) 2015 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
-
-# For compatibility with SCL
-%undefine __brp_mangle_shebangs
-
-%global gh_commit    b184a92419cc9a9c4c6a09db555a94d441cb11c9
+%global gh_commit    42a9561ae23b236da1d5a4acf50f7ea96ebe68aa
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
+%global gh_date      20150503
 %global gh_owner     composer
 %global gh_project   composer
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
-%global api_version  1.1.0
-
-%global upstream_version 1.6.5
-#global upstream_prever  RC
-
-%if 0
-# see https://forum.remirepo.net/viewtopic.php?id=3677
-%global symfony_prefix php-symfony3
-%else
-%global symfony_prefix php-symfony
-%endif
 
 Name:           composer
-Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release:        1%{?dist}
+Version:        1.0.0
+Release:        0.4.%{gh_date}git%{gh_short}%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
 License:        MIT
 URL:            https://getcomposer.org/
-Source0:        %{gh_project}-%{upstream_version}%{?upstream_prever}-%{gh_short}.tgz
+Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz
 Source1:        %{name}-autoload.php
 Source2:        %{name}-bootstrap.php
-# Profile scripts
-Source3:        %{name}.sh
-Source4:        %{name}.csh
-# Get a git snapshot to retrieve the test suite
-Source5:        makesrc.sh
 
-# Use our autoloader, resources path, fix for tests
+# Fix shebang and use our autoloader
 Patch0:         %{name}-rpm.patch
 
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  php-cli
 %if %{with_tests}
-BuildRequires:  php-justinrainbow-json-schema5
-%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires:  (php-composer(composer/spdx-licenses)   >= 1.2 with  php-composer(composer/spdx-licenses)    <  2)
-BuildRequires:  (php-composer(composer/ca-bundle)       >= 1.0 with  php-composer(composer/ca-bundle)        <  2)
-BuildRequires:  (php-composer(composer/semver)          >= 1.0 with  php-composer(composer/semver)           <  2)
-BuildRequires:  (php-composer(seld/jsonlint)            >= 1.4 with  php-composer(seld/jsonlint)             <  2)
-BuildRequires:  (php-composer(seld/phar-utils)          >= 1.0 with  php-composer(seld/phar-utils)           <  2)
-BuildRequires:  (php-composer(seld/cli-prompt)          >= 1.0 with  php-composer(seld/cli-prompt)           <  2)
-BuildRequires:  (php-composer(psr/log)                  >= 1.0 with  php-composer(psr/log)                   <  2)
-%else
-BuildRequires:  php-composer(composer/spdx-licenses)    <  2
-BuildRequires:  php-composer(composer/spdx-licenses)    >= 1.2
-BuildRequires:  php-composer(composer/ca-bundle)        <  2
-BuildRequires:  php-composer(composer/ca-bundle)        >= 1.0
-BuildRequires:  php-composer(composer/semver)           <  2
-BuildRequires:  php-composer(composer/semver)           >= 1.0
-BuildRequires:  php-composer(seld/jsonlint)             <  2
-BuildRequires:  php-composer(seld/jsonlint)             >= 1.4
-BuildRequires:  php-composer(seld/phar-utils)           <  2
-BuildRequires:  php-composer(seld/phar-utils)           >= 1.0
-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
-%endif
-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.8.35 || ^5.7",
-#        "phpunit/phpunit-mock-objects": "^2.3 || ^3.0"
-BuildRequires:  php-composer(phpunit/phpunit)           >= 4.8.35
-# For autoloader
-BuildRequires:  php-composer(fedora/autoloader) >= 0.1.2
-BuildRequires:  php-seld-phar-utils >= 1.0.1
-BuildRequires:  php-seld-cli-prompt >= 1.0.0-3
-BuildRequires:  php-PsrLog          >= 1.0.0-8
+BuildRequires:  php-composer(justinrainbow/json-schema) >= 1.4
+BuildRequires:  php-composer(seld/jsonlint)             >= 1.0
+BuildRequires:  php-composer(symfony/console)           >= 2.5
+BuildRequires:  php-composer(symfony/finder)            >= 2.2
+BuildRequires:  php-composer(symfony/process)           >= 2.1
+BuildRequires:  php-composer(symfony/class-loader)
+BuildRequires:  php-phpunit-PHPUnit
 %endif
 
-# From composer.json, "require": {
-#        "php": "^5.3.2 || ^7.0",
-#        "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0",
-#        "composer/ca-bundle": "^1.0",
-#        "composer/semver": "^1.0",
-#        "composer/spdx-licenses": "^1.2",
-#        "seld/jsonlint": "~1.4",
-#        "symfony/console": "^2.7 || ^3.0 || ^4.0",
-#        "symfony/finder": "^2.7 || ^3.0 || ^4.0",
-#        "symfony/process": "^2.7 || ^3.0 || ^4.0",
-#        "symfony/filesystem": "^2.7 || ^3.0 || ^4.0",
-#        "seld/phar-utils": "^1.0",
-#        "seld/cli-prompt": "^1.0",
-#        "psr/log": "^1.0"
+# From composer.json, requires
+#        "php": ">=5.3.2",
+#        "justinrainbow/json-schema": "~1.4",
+#        "seld/jsonlint": "~1.0",
+#        "symfony/console": "~2.5",
+#        "symfony/finder": "~2.2",
+#        "symfony/process": "~2.1",
+#        "seld/phar-utils": "~1.0",
+#        "seld/cli-prompt": "~1.0"
 Requires:       php(language)                           >= 5.3.2
 Requires:       php-cli
-Requires:       php-justinrainbow-json-schema5
-%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires:       (php-composer(composer/spdx-licenses)   >= 1.2 with  php-composer(composer/spdx-licenses)    <  2)
-Requires:       (php-composer(composer/ca-bundle)       >= 1.0 with  php-composer(composer/ca-bundle)        <  2)
-Requires:       (php-composer(composer/semver)          >= 1.0 with  php-composer(composer/semver)           <  2)
-Requires:       (php-composer(seld/jsonlint)            >= 1.4 with  php-composer(seld/jsonlint)             <  2)
-Requires:       (php-composer(seld/phar-utils)          >= 1.0 with  php-composer(seld/phar-utils)           <  2)
-Requires:       (php-composer(seld/cli-prompt)          >= 1.0 with  php-composer(seld/cli-prompt)           <  2)
-Requires:       (php-composer(psr/log)                  >= 1.0 with  php-composer(psr/log)                   <  2)
-%else
-Requires:       php-composer(composer/spdx-licenses)    >= 1.2
-Requires:       php-composer(composer/spdx-licenses)    <  2
-Requires:       php-composer(composer/ca-bundle)        >= 1.0
-Requires:       php-composer(composer/ca-bundle)        <  2
-Requires:       php-composer(composer/semver)           >= 1.0
-Requires:       php-composer(composer/semver)           <  2
-Requires:       php-composer(seld/jsonlint)             >= 1.4
+Requires:       php-composer(justinrainbow/json-schema) >= 1.4
+Requires:       php-composer(justinrainbow/json-schema) <  2
+Requires:       php-composer(seld/jsonlint)             >= 1.0
 Requires:       php-composer(seld/jsonlint)             <  2
 Requires:       php-composer(seld/phar-utils)           >= 1.0
 Requires:       php-composer(seld/phar-utils)           <  2
 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
-%endif
-Requires:       %{symfony_prefix}-console
-Requires:       %{symfony_prefix}-finder
-Requires:       %{symfony_prefix}-process
-Requires:       %{symfony_prefix}-filesystem
+Requires:       php-composer(symfony/console)           >= 2.5
+Requires:       php-composer(symfony/console)           <  3
+Requires:       php-composer(symfony/finder)            >= 2.2
+Requires:       php-composer(symfony/finder)            <  3
+Requires:       php-composer(symfony/process)           >= 2.1
+Requires:       php-composer(symfony/process)           <  3
 # 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"
 Requires:       php-zip
 Requires:       php-openssl
 # For our autoloader
-Requires:       php-composer(fedora/autoloader)
-Requires:       php-seld-phar-utils >= 1.0.1
-Requires:       php-seld-cli-prompt >= 1.0.0-3
-Requires:       php-PsrLog          >= 1.0.0-8
+Requires:       php-composer(symfony/class-loader)
 # From phpcompatinfo
+Requires:       php-ctype
 Requires:       php-curl
 Requires:       php-date
-Requires:       php-dom
 Requires:       php-filter
 Requires:       php-hash
 Requires:       php-iconv
@@ -167,10 +93,7 @@
 Requires:       php-xsl
 Requires:       php-zlib
 
-# Composer library
 Provides:       php-composer(composer/composer) = %{version}
-# Special internal for Plugin API
-Provides:       php-composer(composer-plugin-api) = %{api_version}
 
 
 %description
@@ -184,38 +107,17 @@
 %setup -q -n %{gh_project}-%{gh_commit}
 
 %patch0 -p1 -b .rpm
-find . -name \*.rpm -exec rm {} \; -print
-
-if grep -r '\.\./res'; then
-	: Patch need to fixed
-	exit 1
-fi
-
 cp -p %{SOURCE1} src/Composer/autoload.php
 cp -p %{SOURCE2} tests/bootstrap.php
 rm src/bootstrap.php
 
 : fix reported version
-%if 0%{?gh_date}
 DATE=%{gh_date}
 DATE=${DATE:0:4}-${DATE:4:2}-${DATE:6:2}
 sed -e '/VERSION/s/@package_version@/%{gh_commit}/' \
     -e '/BRANCH_ALIAS_VERSION/s/@package_branch_alias_version@/%{gh_branch}/' \
     -e "/RELEASE_DATE/s/@release_date@/$DATE/" \
     -i src/Composer/Composer.php
-%else
-sed -e '/BRANCH_ALIAS_VERSION/s/@package_branch_alias_version@//' \
-    -i src/Composer/Composer.php
-%endif
-
-: check Plugin API version
-php -r '
-namespace Composer\Plugin;
-include "src/Composer/Plugin/PluginInterface.php";
-if (version_compare(PluginInterface::PLUGIN_API_VERSION, "%{api_version}")) {
-  printf("Plugin API version is %s, expected %s\n", PluginInterface::PLUGIN_API_VERSION, "%{api_version}");
-  exit(1);
-}'
 
 
 %build
@@ -223,20 +125,15 @@
 
 
 %install
-: Profile scripts
-mkdir -p %{buildroot}%{_sysconfdir}/profile.d
-install -m 644 %{SOURCE3} %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/
+rm -rf       %{buildroot}
 
 : Library
 mkdir -p     %{buildroot}%{_datadir}/php
 cp -pr src/* %{buildroot}%{_datadir}/php
 
 : Resources
-mkdir -p       %{buildroot}%{_datadir}/%{name}
-cp -pr res     %{buildroot}%{_datadir}/%{name}/res
-cp -p  LICENSE %{buildroot}%{_datadir}/%{name}/LICENSE
-
-ln -sf %{_datadir}/%{name}/LICENSE LICENSE
+mkdir -p     %{buildroot}%{_datadir}/%{name}
+cp -pr res   %{buildroot}%{_datadir}/%{name}/res
 
 : Command
 install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
@@ -244,271 +141,29 @@
 
 %check
 %if %{with_tests}
-: Online tests
-rm tests/Composer/Test/Util/RemoteFilesystemTest.php
-
-: Known to fail - regression in recent symfony version
-sed -e 's/testDevWarningPrevented/SKIP_testDevWarningPrevented/' \
-    -e 's/testDevWarningPreventedAlias/SKIP_testDevWarningPreventedAlias/' \
-    -i tests/Composer/Test/ApplicationTest.php
-
-: Ensure not used
-rm -rf res
-
 : Run test suite
 export BUILDROOT=%{buildroot}
-
-# testIntegration may hang on local build
-ret=0
-for cmd in php php70 php71 php72; do
-  if which $cmd; then
-    $cmd -d memory_limit=1G %{_bindir}/phpunit \
-      --filter '^((?!(testIntegration)).)*$' \
-      --include-path %{buildroot}%{_datadir}/php  || ret=1
-  fi
-done
-exit $ret
+%{_bindir}/phpunit --include-path $PWD/src || :
 %else
 : Test suite disabled
 %endif
 
 
+%clean
+rm -rf %{buildroot}
+
+
 %files
+%defattr(-,root,root,-)
 %{!?_licensedir:%global license %%doc}
 %license LICENSE
 %doc *.md doc
-%doc composer.json
-%config(noreplace) %{_sysconfdir}/profile.d/%{name}.*
 %{_bindir}/%{name}
 %{_datadir}/php/Composer
 %{_datadir}/%{name}
 
 
 %changelog
-* Fri May  4 2018 Remi Collet <remi@remirepo.net> - 1.6.5-1
-- update to 1.6.5
-
-* 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
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* 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
-
-* Sun Jan  7 2018 Remi Collet <remi@remirepo.net> - 1.6.2-1
-- Update to 1.6.2
-
-* Thu Jan  4 2018 Remi Collet <remi@remirepo.net> - 1.6.1-1
-- Update to 1.6.1
-
-* Thu Jan  4 2018 Remi Collet <remi@remirepo.net> - 1.6.0-2
-- open https://github.com/composer/composer/pull/6974
-  Fix dependency on composer/spdx-licenses
-- raise dependency on composer/spdx-licenses 1.2
-
-* Mon Dec 18 2017 Remi Collet <remi@remirepo.net> - 1.5.6-1
-- Update to 1.5.6
-- switch to symfony package names
-
-* Fri Dec  1 2017 Remi Collet <remi@remirepo.net> - 1.5.5-1
-- Update to 1.5.5
-
-* Fri Dec  1 2017 Remi Collet <remi@remirepo.net> - 1.5.4-1
-- Update to 1.5.4
-
-* Fri Dec  1 2017 Remi Collet <remi@remirepo.net> - 1.5.3-1
-- Update to 1.5.3
-
-* Mon Sep 11 2017 Remi Collet <remi@remirepo.net> - 1.5.2-1
-- Update to 1.5.2
-
-* Wed Aug  9 2017 Remi Collet <remi@remirepo.net> - 1.5.1-1
-- Update to 1.5.1
-
-* Tue Aug  8 2017 Remi Collet <remi@remirepo.net> - 1.5.0-1
-- Update to 1.5.0
-
-* Mon Aug  7 2017 Remi Collet <remi@remirepo.net> - 1.4.3-1
-- Update to 1.4.3
-- ignore 2 failed tests related to BC break in symfony
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Mon May 22 2017 Remi Collet <remi@remirepo.net> - 1.4.2-2
-- Update to 1.4.2
-- fix autoloader to allow symfony 2 and 3
-- raise dependency on justinrainbow/json-schema v5
-- open https://github.com/composer/composer/pull/6435 - fix tests
-
-* Fri Mar 10 2017 Remi Collet <remi@remirepo.net> - 1.4.1-1
-- Update to 1.4.1
-
-* Wed Mar  8 2017 Remi Collet <remi@remirepo.net> - 1.4.0-1
-- Update to 1.4.0
-- raise dependency on justinrainbow/json-schema version 3 to 5
-
-* Wed Mar  8 2017 Remi Collet <remi@remirepo.net> - 1.3.3-1
-- Update to 1.3.3
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Sat Jan 28 2017 Remi Collet <remi@fedoraproject.org> - 1.3.2-1
-- update to 1.3.2
-
-* Sat Jan  7 2017 Remi Collet <remi@fedoraproject.org> - 1.3.1-1
-- update to 1.3.1
-
-* Sat Dec 24 2016 Remi Collet <remi@fedoraproject.org> - 1.3.0-1
-- update to 1.3.0
-- raise dependency on symfony 2.7
-- allow justinrainbow/json-schema 4
-
-* Fri Dec 16 2016 Remi Collet <remi@fedoraproject.org> - 1.2.4-2
-- fix BR for json-schema, FTBFS from Koschei
-
-* Wed Dec  7 2016 Remi Collet <remi@fedoraproject.org> - 1.2.4-1
-- update to 1.2.4
-
-* Thu Dec  1 2016 Remi Collet <remi@fedoraproject.org> - 1.2.3-1
-- update to 1.2.3
-
-* Thu Nov 17 2016 Remi Collet <remi@fedoraproject.org> - 1.2.2-2
-- add profile scripts so globally installed commands
-  will be found in default user path #1394577
-
-* Thu Nov  3 2016 Remi Collet <remi@fedoraproject.org> - 1.2.2-1
-- update to 1.2.2
-
-* Fri Oct 21 2016 Remi Collet <remi@fedoraproject.org> - 1.2.1-2
-- switch from symfony/class-loader to fedora/autoloader
-
-* Mon Sep 12 2016 Remi Collet <remi@fedoraproject.org> - 1.2.1-1
-- update to 1.2.1
-
-* Tue Jul 19 2016 Remi Collet <remi@fedoraproject.org> - 1.2.0-1
-- update to 1.2.0
-- switch to justinrainbow/json-schema v2
-
-* Sun Jun 26 2016 Remi Collet <remi@fedoraproject.org> - 1.1.3-1
-- update to 1.1.3
-
-* Wed Jun  1 2016 Remi Collet <remi@fedoraproject.org> - 1.1.2-1
-- update to 1.1.2
-
-* Tue May 31 2016 Remi Collet <remi@fedoraproject.org> - 1.1.1-2
-- ensure justinrainbow/json-schema v1 is used for the build
-
-* Tue May 17 2016 Remi Collet <remi@fedoraproject.org> - 1.1.1-1
-- update to 1.1.1
-- add dependency on composer/ca-bundle
-- add dependency on psr/log
-- bump composer-plugin-api to 1.1.0
-- drop dependency on ca-certificates
-
-* Sat Apr 30 2016 Remi Collet <remi@fedoraproject.org> - 1.0.3-1
-- update to 1.0.3
-
-* Thu Apr 21 2016 Remi Collet <remi@fedoraproject.org> - 1.0.2-1
-- update to 1.0.2
-
-* Tue Apr 19 2016 Remi Collet <remi@fedoraproject.org> - 1.0.1-1
-- update to 1.0.1
-- add dependency on ca-certificates
-- fix patch for RPM path
-
-* Tue Apr  5 2016 Remi Collet <remi@fedoraproject.org> - 1.0.0-1
-- update to 1.0.0
-
-* Tue Mar 29 2016 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.22.beta2
-- update to 1.0.0beta2
-
-* Fri Mar  4 2016 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.21.beta1
-- update to 1.0.0beta1
-
-* Tue Feb 23 2016 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.20.201602git4c0e163
-- new snapshot
-- raise dependency on justinrainbow/json-schema ^1.6
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-0.19.20160106git64b0d72
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Fri Jan  8 2016 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.18.20160106git64b0d72
-- add patch for json-schema 1.6, FTBFS detected by Koschei
-  open https://github.com/composer/composer/pull/4756
-- new snapshot
-- raise dependency on seld/jsonlint ^1.4
-
-* Thu Jan  7 2016 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.16.alpha1
-- remove duplicated register in autoloader
-
-* Sat Nov 14 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.15.alpha1
-- update to 1.0.0alpha11
-
-* Mon Nov  2 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.14.20151030git5a5088e
-- new snapshot
-- allow symfony 3
-
-* Wed Oct 14 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.13.20151013gita54f84f
-- new snapshot
-- use autoloader from all dependencies
-
-* Sun Oct 11 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.12.20151007git7a9eb02
-- new snapshot
-- provide php-composer(composer-plugin-api)
-- don't check version in diagnose command
-- add dependency on composer/semver
-- add dependency on symfony/filesystem
-
-* Tue Sep  8 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.9.20150907git9f6fdfd
-- new snapshot
-- add LICENSE in application data, as used by the code
-
-* Fri Aug  7 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.8.20150804gitc83650f
-- new snapshot
-
-* Tue Jul 21 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.8.20150720git00c2679
-- new snapshot
-- add dependency on composer/spdx-licenses
-
-* Thu Jul 16 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.7.20150714git92faf1c
-- new snapshot
-- raise dependency on justinrainbow/json-schema 1.4.4
-
-* Mon Jun 29 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.6.20150626git943107c
-- new snapshot
-- review autoloader
-
-* Sun Jun 21 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.5.20150620gitd0ff016
-- new snapshot
-- add missing BR on php-zip
-- open https://github.com/composer/composer/pull/4169 for online test
-
-* Mon Jun 15 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.5.20150614git8e9659b
-- new snapshot
-
-* Sun Jun  7 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.5.20150605git9fb2d4f
-- new snapshot
-
-* Tue Jun  2 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.5.20150531git0ec86be
-- new snapshot
-
-* Tue May 26 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.5.20150525git69210d5
-- new snapshot
-- ensure /usr/share/php is in include_path (for SCL)
-
-* Wed May 13 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.4.20150511gitbc45d91
-- new snapshot
-
 * Mon May  4 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.4.20150503git42a9561
 - new snapshot
 - add dependencies on seld/phar-utils and seld/cli-prompt

composer-rpm.patch Changed

@@ -1,61 +1,64 @@
 diff -up ./bin/composer.rpm ./bin/composer
---- ./bin/composer.rpm	2018-05-04 12:59:13.065292434 +0200
-+++ ./bin/composer	2018-05-04 13:00:23.293493373 +0200
-@@ -6,7 +6,7 @@ if (PHP_SAPI !== 'cli') {
+--- ./bin/composer.rpm	2015-02-25 20:44:34.000000000 +0100
++++ ./bin/composer	2015-02-26 10:25:16.012610034 +0100
+@@ -1,11 +1,11 @@
+-#!/usr/bin/env php
++#!/usr/bin/env php
+ <?php
+ 
+ if (PHP_SAPI !== 'cli') {
+     echo 'Warning: Composer should be invoked via the CLI version of PHP, not the '.PHP_SAPI.' SAPI'.PHP_EOL;
  }
  
- setlocale(LC_ALL, 'C');
 -require __DIR__.'/../src/bootstrap.php';
-+require '/usr/share/php/Composer/autoload.php';
- 
- use Composer\Factory;
- use Composer\XdebugHandler;
-diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php
---- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2018-05-04 12:57:41.000000000 +0200
-+++ ./src/Composer/Autoload/AutoloadGenerator.php	2018-05-04 12:59:13.066292451 +0200
-@@ -305,7 +305,7 @@ EOF;
-         file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion));
++require 'Composer/autoload.php';
  
-         $this->safeCopy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php');
--        $this->safeCopy(__DIR__.'/../../../LICENSE', $targetDir.'/LICENSE');
-+        $this->safeCopy((getenv('BUILDROOT')?:'') . '/usr/share/composer/LICENSE', $targetDir.'/LICENSE');
+ use Composer\Console\Application;
  
-         if ($this->runScripts) {
-             $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array(
-diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
---- ./src/Composer/Compiler.php.rpm	2018-05-04 12:57:41.000000000 +0200
-+++ ./src/Composer/Compiler.php	2018-05-04 12:59:13.066292451 +0200
-@@ -97,7 +97,7 @@ class Compiler
-         $finder = new Finder();
-         $finder->files()
-             ->name('*.json')
--            ->in(__DIR__.'/../../res')
-+            ->in((getenv('BUILDROOT')?:'') . '/usr/share/composer/res')
-             ->in(SpdxLicenses::getResourcesDir())
-             ->sort($finderSort)
-         ;
 diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
---- ./src/Composer/Json/JsonFile.php.rpm	2018-05-04 12:57:41.000000000 +0200
-+++ ./src/Composer/Json/JsonFile.php	2018-05-04 12:59:13.066292451 +0200
-@@ -156,7 +156,7 @@ class JsonFile
+--- ./src/Composer/Json/JsonFile.php.rpm	2015-02-25 20:44:34.000000000 +0100
++++ ./src/Composer/Json/JsonFile.php	2015-02-26 10:25:16.012610034 +0100
+@@ -149,7 +149,7 @@ class JsonFile
              self::validateSyntax($content, $this->path);
          }
  
 -        $schemaFile = __DIR__ . '/../../../res/composer-schema.json';
 +        $schemaFile = (getenv('BUILDROOT')?:'') . '/usr/share/composer/res/composer-schema.json';
+         $schemaData = json_decode(file_get_contents($schemaFile));
  
-         // Prepend with file:// only when not using a special schema already (e.g. in the phar)
-         if (false === strpos($schemaFile, '://')) {
-diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php
---- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2018-05-04 12:57:41.000000000 +0200
-+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2018-05-04 12:59:13.066292451 +0200
-@@ -97,7 +97,8 @@ class ComposerSchemaTest extends TestCas
-     private function check($json)
+         if ($schema === self::LAX_SCHEMA) {
+diff -up src/Composer/Util/SpdxLicense.php.old src/Composer/Util/SpdxLicense.php
+--- ./src/Composer/Util/SpdxLicense.php.old	2015-04-17 09:57:53.680999733 +0200
++++ ./src/Composer/Util/SpdxLicense.php	2015-04-17 09:59:50.397498276 +0200
+@@ -38,7 +38,7 @@ class SpdxLicense
+             return $this->licenses;
+         }
+
+-        $jsonFile = new JsonFile(__DIR__ . '/../../../res/spdx-licenses.json');
++        $jsonFile = new JsonFile((getenv('BUILDROOT')?:'') . '/usr/share/composer/res/spdx-licenses.json');
+         $this->licenses = $jsonFile->read();
+
+         return $this->licenses;
+diff -up src/Composer/Util/SpdxLicensesUpdater.php.old src/Composer/Util/SpdxLicensesUpdater.php
+--- ./src/Composer/Util/SpdxLicensesUpdater.php.old	2015-04-17 09:58:00.645029479 +0200
++++ ./src/Composer/Util/SpdxLicensesUpdater.php	2015-04-17 10:00:36.578695534 +0200
+@@ -28,7 +28,7 @@ class SpdxLicensesUpdater
      {
-         $validator = new Validator();
--        $validator->check(json_decode($json), (object) array('$ref' => 'file://' . __DIR__ . '/../../../../res/composer-schema.json'));
-+        $f = (getenv('BUILDROOT')?:'') . '/usr/share/composer/res/composer-schema.json';
-+        $validator->check(json_decode($json), (object) array('$ref' => 'file://' . $f));
+         $json = json_encode($this->getLicenses(), true);
+         $prettyJson = JsonFormatter::format($json, true, true);
+-        file_put_contents(__DIR__ . '/../../../res/spdx-licenses.json', $prettyJson);
++        file_put_contents((getenv('BUILDROOT')?:'') . '/usr/share/composer/res/spdx-licenses.json', $prettyJson);
+     }
+
+     private function getLicenses()
+diff -up ./tests/Composer/Test/Json/JsonFileTest.php.rpm ./tests/Composer/Test/Json/JsonFileTest.php
+--- ./tests/Composer/Test/Json/JsonFileTest.php.rpm	2015-02-26 10:26:10.607821640 +0100
++++ ./tests/Composer/Test/Json/JsonFileTest.php	2015-02-26 10:27:05.430034125 +0100
+@@ -54,6 +54,7 @@ class JsonFileTest extends \PHPUnit_Fram
  
-         if (!$validator->isValid()) {
-             $errors = $validator->getErrors();
+     public function testParseErrorDetectSingleQuotes()
+     {
++        $this->markTestSkipped('jsonc issue');
+         $json = '{
+         \'foo\': "bar"
+ }';

composer-1.6.5-b184a92.tgz -> composer-1.0.0-42a9561.tar.gz Changed

composer-autoload.php Changed

@@ -1,24 +1,18 @@
 <?php
-/* Autoloader for composer/composer and its dependencies */
-
 $vendorDir = '/usr/share/php';
-require_once $vendorDir . '/Fedora/Autoloader/autoload.php';
-
-\Fedora\Autoloader\Autoload::addPsr4('Composer\\', __DIR__);
-
-// Dependencies
-\Fedora\Autoloader\Dependencies::required([
-	$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',
-	$vendorDir . '/Composer/CaBundle/autoload.php',
-	$vendorDir . '/Composer/Spdx/autoload.php',
-	$vendorDir . '/Composer/Semver/autoload.php',
-	$vendorDir . '/Psr/Log/autoload.php',
-	$vendorDir . '/JsonSchema5/autoload.php',
-]);
+require_once $vendorDir . '/Symfony/Component/ClassLoader/UniversalClassLoader.php';
+use Symfony\Component\ClassLoader\UniversalClassLoader;
 
+$loader = new UniversalClassLoader();
+$loader->registerNamespaces(array(
+    'Seld\\JsonLint'                      => $vendorDir,
+    'Seld\\PharUtils'                     => $vendorDir,
+    'Seld\\CliPrompt'                     => $vendorDir,
+    'JsonSchema'                          => $vendorDir,
+    'Symfony\\Component\\Console'         => $vendorDir,
+    'Symfony\\Component\\Finder'          => $vendorDir,
+    'Symfony\\Component\\Process'         => $vendorDir,
+    'Symfony\\Component\\ClassLoader'     => $vendorDir,
+    'Composer'                            => dirname(__DIR__)
+));
+$loader->register();

composer-bootstrap.php Changed

composer.csh Deleted

composer.dsc Added

composer.sh Deleted

composer_1.6.5-1.debian.tar.xz Deleted

composer_1.6.5-1.dsc Deleted

@@ -1,38 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-Format: 3.0 (quilt)
-Source: composer
-Binary: composer
-Architecture: all
-Version: 1.6.5-1
-Maintainer: Debian PHP PEAR Maintainers <pkg-php-pear@lists.alioth.debian.org>
-Uploaders: David Prévot <taffit@debian.org>
-Homepage: https://getcomposer.org/
-Standards-Version: 4.1.4
-Vcs-Browser: https://salsa.debian.org/php-team/pear/composer
-Vcs-Git: https://salsa.debian.org/php-team/pear/composer.git
-Build-Depends: debhelper (>= 9), help2man, jsonlint, php-cli-prompt, php-composer-ca-bundle, php-composer-semver, php-composer-spdx-licenses, php-json-schema, php-psr-log, php-symfony-console, php-symfony-filesystem, php-symfony-finder, php-symfony-process, phpab, pkg-php-tools (>= 1.29~)
-Package-List:
- composer deb php optional arch=all
-Checksums-Sha1:
- f62b6799cb0a0d408d35ec3af85473000bf81b82 398169 composer_1.6.5.orig.tar.gz
- 56843ade87f0cee62fbe2c08aace1050ecf4d66c 6828 composer_1.6.5-1.debian.tar.xz
-Checksums-Sha256:
- da4f81a53f845ed0ac4d77fb6d57e3644002b660f4c31cdd14a5a9c340db9776 398169 composer_1.6.5.orig.tar.gz
- 051d2c34ceb64598caf97d65604ec1fcc32cc3433d45e26e3f4e2cc0262a5a52 6828 composer_1.6.5-1.debian.tar.xz
-Files:
- 2feed0f843c82f863710f31539913a25 398169 composer_1.6.5.orig.tar.gz
- 5bed3c5ac0d42952973c6963f232d203 6828 composer_1.6.5-1.debian.tar.xz
-
------BEGIN PGP SIGNATURE-----
-
-iQEzBAEBCAAdFiEEeHVNB7wJXHRI941mBYwc+UT2vTwFAlrw7OkACgkQBYwc+UT2
-vTwHTQgAm4MoIz4Xram+pxL9m3IHQI8hPMo2FZ2ba+7htZt/X9u0N+KfLdLw15zL
-AmaYhmXvJIECoaQBQUXAGIkUXuv153Wbc4YT6kqf92b0nWj7TxtEPychlsd1hXDH
-R7WhCuhlfK43B6tWUv6eda3kY32iikxnXx6U352M7phLttl4ZDZGhvbb8DfEmUc3
-7JGYD2PT0Bktn634ToHdSeCEILDRO7cyekfvN4iwvbCM1vQM5FOCQCsZ6IEC0ewo
-mhezrw8PFtjwWBGGF4ckI3wWJUNOZr3Ro85K7T7fz1A3DBNHhMv2bh8HS6zF/XyC
-PszxvRwrpTYbvklGzmT2sGQwzDgm7w==
-=Dc3a
------END PGP SIGNATURE-----

composer_1.6.5.orig.tar.gz Deleted

debian.changelog Added

debian.control Added

debian.rules Added

debian.tar.gz Added

makesrc.sh Deleted

Overview

Request 2275 (accepted)

Request History