[packages/satis] use system packages; not bundle vendor

glen glen at pld-linux.org
Wed Jan 6 21:54:11 CET 2016


commit 2e947a8ea3d36c2a9a21e7feab5c85f022b1e21c
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Jan 6 22:09:39 2016 +0200

    use system packages; not bundle vendor

 satis.spec | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)
---
diff --git a/satis.spec b/satis.spec
index 3a17a03..49769b9 100644
--- a/satis.spec
+++ b/satis.spec
@@ -1,5 +1,5 @@
 
-%define		rel		0.4
+%define		rel		0.5
 %define		githash	48191ff
 # $ git rev-list 1.0.0-alpha1..%{githash} --count
 %define		commits	152
@@ -15,12 +15,13 @@ Group:		Development/Languages/PHP
 #Source0:	https://github.com/composer/satis/archive/%{version}-%{subver}/%{name}-%{version}%{subver}.tar.gz
 Source0:	https://github.com/composer/satis/archive/%{githash}/%{name}-%{version}-%{subver}-%{commits}-g%{githash}.tar.gz
 # Source0-md5:	adee07882bc8c526b6bd3489812bc194
-Patch0:		versionparser.patch
+Source1:	autoload.php
 URL:		https://github.com/composer/satis
 BuildRequires:	composer
 BuildRequires:	rpm-php-pearprov >= 4.4.2-11
 BuildRequires:	rpmbuild(macros) >= 1.461
 BuildRequires:	sed >= 4.0
+Requires:	composer >= 1.0.0-15.alpha11
 Requires:	php(core) >= %{php_min_version}
 Requires:	php(ctype)
 Requires:	php(filter)
@@ -47,22 +48,21 @@ Repository file.
 %setup -qc -n %{name}-%{version}-%{release}
 mv %{name}-*/* .
 
-%{__sed} -i -e '1s,^#!.*env php,#!/usr/bin/php,' bin/*
-%{__rm} composer.lock
+cp -p %{SOURCE1} src/bootstrap.php
 
-%build
-composer install --prefer-dist --no-dev -v
+%{__sed} -i -e '1s,^#!.*env php,#!/usr/bin/php,' bin/*
 
-%patch0 -p7 -d vendor/composer/semver/src
+# not needed runtime
+mv bin/compile .
+mv src/Composer/Satis/Compiler.php .
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_appdir}}
-cp -a bin src vendor views $RPM_BUILD_ROOT%{_appdir}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{php_data_dir}/Composer,%{_appdir}}
+cp -a src/Composer $RPM_BUILD_ROOT%{php_data_dir}
+cp -a bin views $RPM_BUILD_ROOT%{_appdir}
 ln -s %{_appdir}/bin/%{name} $RPM_BUILD_ROOT%{_bindir}/%{name}
 
-%{__rm} -r $RPM_BUILD_ROOT%{_appdir}/vendor/twig/twig/test
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -70,9 +70,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc README.md LICENSE
 %attr(755,root,root) %{_bindir}/satis
+%{php_data_dir}/Composer/Satis
 %dir %{_appdir}
 %dir %{_appdir}/bin
 %attr(755,root,root) %{_appdir}/bin/*
-%{_appdir}/src
-%{_appdir}/vendor
 %{_appdir}/views
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/satis.git/commitdiff/3988f08758651b2ac6a304ef7099421bc04e8bc6



More information about the pld-cvs-commit mailing list