From d3b965a9546e6f52b47e30e00be525e18f68939e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 24 Jan 2014 07:48:21 +0100 Subject: php-phpseclib-crypt-rsa: backport --- Makefile | 4 ++++ php-phpseclib-crypt-rsa.spec | 11 ++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 Makefile 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-rsa.spec b/php-phpseclib-crypt-rsa.spec index bc380bc..0672310 100644 --- a/php-phpseclib-crypt-rsa.spec +++ b/php-phpseclib-crypt-rsa.spec @@ -1,4 +1,3 @@ -%{!?pear_metadir: %global pear_metadir %{pear_phpdir}} %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} %global pear_name Crypt_RSA @@ -15,6 +14,7 @@ Source0: http://phpseclib.sourceforge.net/get/%{pear_name}-%{version}.tgz # https://sourceforge.net/p/phpseclib/bugs/4/ Patch0: %{pear_name}-role.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: php-pear(PEAR) @@ -51,6 +51,7 @@ cd %{pear_name}-%{version} %install +rm -rf $RPM_BUILD_ROOT cd %{pear_name}-%{version} %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml @@ -62,6 +63,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 || : @@ -74,6 +79,7 @@ fi %files +%defattr(-, root, root, -) %{pear_xmldir}/%{name}.xml %{pear_phpdir}/Crypt/RSA.php %dir %{pear_cfgdir}/%{pear_name} @@ -81,6 +87,9 @@ fi %changelog +* Sat Jan 24 2014 Remi Collet - 0.3.5-3 +- backport for remi repo + * Thu Jan 09 2014 Adam Williamson - 0.3.5-3 - fix up config file install and use (from Remi Collet) -- cgit