[php-doctrine-Doctrine] fix metadir location FTBFS #914331

Christof Damian cdamian at fedoraproject.org
Sat Feb 23 17:55:09 UTC 2013


commit 714cb13f5e1f461e9813e5db32c0bd7ca36ab1cc
Author: Christof Damian <christof at damian.net>
Date:   Sat Feb 23 18:54:30 2013 +0100

    fix metadir location FTBFS #914331

 php-doctrine-Doctrine.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/php-doctrine-Doctrine.spec b/php-doctrine-Doctrine.spec
index c0d086a..4381bdb 100644
--- a/php-doctrine-Doctrine.spec
+++ b/php-doctrine-Doctrine.spec
@@ -1,9 +1,10 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
+%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
 %global pear_name Doctrine
 
 Name:           php-doctrine-Doctrine
 Version:        1.2.4
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        PHP Object Relational Mapper
 
 Group:          Development/Libraries
@@ -54,7 +55,7 @@ mkdir -p docdir
 mv $RPM_BUILD_ROOT%{pear_datadir}/%{pear_name}/LICENSE docdir
 
 # Clean up unnecessary files
-rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
+rm -rf %{buildroot}/%{pear_metadir}/.??* 
 
 
 # Install XML package description
@@ -90,6 +91,9 @@ fi
 %{pear_phpdir}/%{pear_name}
 
 %changelog
+* Sat Feb 23 2013 Christof Damian <christof at damian.net> - 1.2.4-5
+- use pear_metadir
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list