summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer-rpm.patch12
-rw-r--r--composer.spec17
2 files changed, 24 insertions, 5 deletions
diff --git a/composer-rpm.patch b/composer-rpm.patch
index d53705a..35246d0 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -22,3 +22,15 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
$schemaData = json_decode(file_get_contents($schemaFile));
if ($schema === self::LAX_SCHEMA) {
+diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php
+--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm 2015-08-23 08:55:33.537606407 +0200
++++ ./src/Composer/Autoload/AutoloadGenerator.php 2015-08-23 08:56:17.341809277 +0200
+@@ -268,7 +268,7 @@ EOF;
+ file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $classMapAuthoritative));
+
+ $this->safeCopy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php');
+- $this->safeCopy(__DIR__.'/../../../LICENSE', $targetDir.'/LICENSE');
++ $this->safeCopy((getenv('BUILDROOT')?:'') . '/usr/share/composer/LICENSE', $targetDir.'/LICENSE');
+
+ $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array(
+ 'optimize' => (bool) $scanPsr0Packages,
diff --git a/composer.spec b/composer.spec
index b4c6bb4..5dbbb4e 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,17 +6,17 @@
#
# Please, preserve the changelog entries
#
-%global gh_commit c83650f299cfff1049cd61ea72ee5345bd4f92d3
+%global gh_commit f1aa655e6113e0efa979b8b09d7951a762eaa04c
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_branch 1.0-dev
-%global gh_date 20150804
+%global gh_date 20150820
%global gh_owner composer
%global gh_project composer
%global with_tests %{?_without_tests:0}%{!?_without_tests:1}
Name: composer
Version: 1.0.0
-Release: 0.8.%{gh_date}git%{gh_short}%{?dist}
+Release: 0.9.%{gh_date}git%{gh_short}%{?dist}
Summary: Dependency Manager for PHP
Group: Development/Libraries
@@ -138,8 +138,11 @@ mkdir -p %{buildroot}%{_datadir}/php
cp -pr src/* %{buildroot}%{_datadir}/php
: Resources
-mkdir -p %{buildroot}%{_datadir}/%{name}
-cp -pr res %{buildroot}%{_datadir}/%{name}/res
+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
: Command
install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
@@ -171,6 +174,10 @@ rm -rf %{buildroot}
%changelog
+* Sun Aug 23 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.9.201508gitf1aa655
+- 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