[php-swift-Swift: 3/3] use php_metadir

Christof Damian cdamian at fedoraproject.org
Wed Oct 31 19:11:18 UTC 2012


commit e29daf86a0b744e897d8cceafc82ac823dba240a
Author: Christof Damian <christof at damian.net>
Date:   Wed Oct 31 20:10:05 2012 +0100

    use php_metadir

 php-swift-Swift.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/php-swift-Swift.spec b/php-swift-Swift.spec
index ccb41a8..7cbe15b 100644
--- a/php-swift-Swift.spec
+++ b/php-swift-Swift.spec
@@ -1,9 +1,10 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
+%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
 %global pear_name Swift
 
 Name:           php-swift-Swift
 Version:        4.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Free Feature-rich PHP Mailer
 
 Group:          Development/Libraries
@@ -47,7 +48,7 @@ rm -rf $RPM_BUILD_ROOT docdir
 %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
 
 # Clean up unnecessary files
-rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
+rm -rf %{buildroot}/%{pear_metadir}/.??* 
 
 mkdir -p $RPM_BUILD_ROOT%{pear_phpdir}/tmp
 mv $RPM_BUILD_ROOT%{pear_phpdir}/*.php \
@@ -85,6 +86,9 @@ fi
 %{pear_phpdir}/%{pear_name}
 
 %changelog
+* Wed Oct 31 2012 Christof Damian <christof at damian.net> - 4.2.2-2
+- use php_metadir
+
 * Tue Oct 30 2012 Christof Damian <christof at damian.net> - 4.2.2-1
 - upstream 4.2.2
 


More information about the scm-commits mailing list