summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-01-15 07:26:47 +0100
committerRemi Collet <fedora@famillecollet.com>2014-01-15 07:26:47 +0100
commit3c95eb063e3ff1fbd1b3329f9a78fc2ae6f903e3 (patch)
treefa2dc127725d99585ad13a887fca100fe4af2383
parent34234559a2cb13d36af4d16adeb7f2944fecc390 (diff)
php-phpseclib-crypt-blowfish: backport
-rw-r--r--Makefile4
-rw-r--r--php-phpseclib-crypt-blowfish.spec10
2 files changed, 14 insertions, 0 deletions
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..13af741
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,4 @@
+SRCDIR := $(shell pwd)
+NAME := $(shell basename $(SRCDIR))
+include ../../../common/Makefile
+
diff --git a/php-phpseclib-crypt-blowfish.spec b/php-phpseclib-crypt-blowfish.spec
index 0bfab0a..40ef53e 100644
--- a/php-phpseclib-crypt-blowfish.spec
+++ b/php-phpseclib-crypt-blowfish.spec
@@ -12,6 +12,7 @@ License: MIT
URL: http://phpseclib.sourceforge.net/
Source0: http://phpseclib.sourceforge.net/get/%{pear_name}-%{version}.tgz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: php-pear(PEAR)
@@ -45,6 +46,7 @@ cd %{pear_name}-%{version}
%install
+rm -rf $RPM_BUILD_ROOT
cd %{pear_name}-%{version}
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
@@ -56,6 +58,10 @@ mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
%post
%{__pear} install --nodeps --soft --force --register-only \
%{pear_xmldir}/%{name}.xml >/dev/null || :
@@ -68,11 +74,15 @@ fi
%files
+%defattr(-, root, root, -)
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/Crypt/Blowfish-phpseclib.php
%changelog
+* Wed Jan 15 2014 Remi Collet <rpms@famillecollet.com> - 0.3.5-4
+- backport for remi repo
+
* Fri Jan 10 2014 Adam Williamson <awilliam@redhat.com> - 0.3.5-4
- requires crypt-hash, drop ownership of Crypt dir