From 82b2fd13e96bf563b2f70174176eaf92f51f4850 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 25 Jan 2014 07:34:16 +0100 Subject: php-phpseclib-net-sftp: backport --- Makefile | 4 ++++ php-phpseclib-net-sftp.spec | 13 +++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) 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-net-sftp.spec b/php-phpseclib-net-sftp.spec index 39b7670..a1835a9 100644 --- a/php-phpseclib-net-sftp.spec +++ b/php-phpseclib-net-sftp.spec @@ -1,5 +1,4 @@ -%{!?pear_metadir: %global pear_metadir %{pear_phpdir}} -%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} +%{!?__pear: %global __pear %{_bindir}/pear} %global pear_name Net_SFTP Name: php-phpseclib-net-sftp @@ -12,6 +11,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) @@ -43,6 +43,7 @@ cd %{pear_name}-%{version} %install +rm -rf $RPM_BUILD_ROOT cd %{pear_name}-%{version} %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml @@ -54,6 +55,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 || : @@ -66,12 +71,16 @@ fi %files +%defattr(-, root, root, -) %{pear_xmldir}/%{name}.xml %{pear_phpdir}/Net/SFTP %{pear_phpdir}/Net/SFTP.php %changelog +* Sat Jan 25 2014 Remi Collet - 0.3.5-3 +- backport for remi repo + * Sat Jan 4 2014 Adam Williamson - 0.3.5-2 - various review style cleanups -- cgit