[packages/satis] install fixes
glen
glen at pld-linux.org
Fri Apr 12 16:29:58 CEST 2013
commit 64e8585633a8ad315ae7eee6a32829eb539d8840
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Fri Apr 12 17:29:15 2013 +0300
install fixes
satis.spec | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
---
diff --git a/satis.spec b/satis.spec
index 602b832..b77e830 100644
--- a/satis.spec
+++ b/satis.spec
@@ -3,17 +3,21 @@
Summary: Package Repository Generator
Name: satis
Version: 1.0.0
-Release: 0.3
+Release: 0.9
License: MIT
Group: Development/Languages/PHP
-Source0: https://github.com/composer/satis/archive/master.tar.gz
-# Source0-md5: a149bce7151e35dc23acc53522eefea5
+Source0: https://github.com/composer/satis/archive/master.tar.gz?/%{name}-%{version}.tgz
+# Source0-md5: 3f36d065a6bfc9adef23e2f0a74b42f3
URL: https://github.com/composer/satis
-BuildRequires: composer-php
+BuildRequires: composer
BuildRequires: rpm-php-pearprov >= 4.4.2-11
BuildRequires: rpmbuild(macros) >= 1.461
BuildRequires: sed >= 4.0
Requires: php(core) >= %{php_min_version}
+Requires: php(ctype)
+Requires: php(json)
+Requires: php(spl)
+Suggests: php(openssl)
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -30,11 +34,12 @@ Repository file.
%setup -qc
mv %{name}-*/* .
-
%{__sed} -i -e '1s,^#!.*env php,#!%{__php},' bin/*
+%{__rm} composer.lock
%build
-composer install -v
+COMPOSER_HOME=${PWD:=$(pwd)} \
+composer install --prefer-dist -v
%install
rm -rf $RPM_BUILD_ROOT
@@ -42,6 +47,8 @@ install -d $RPM_BUILD_ROOT{%{_bindir},%{_appdir}}
cp -a bin src vendor 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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/satis.git/commitdiff/3db193a496b632a5a6b0f2847da790969af78c0e
More information about the pld-cvs-commit
mailing list