[php-pear-Structures-DataGrid-DataSource-MDB2] fix metadata location

Remi Collet remi at fedoraproject.org
Tue Feb 19 15:34:20 UTC 2013


commit 86a3b7b72b2207268631b0dc2699f66f9c6b389b
Author: Remi Collet <rcollet at redhat.com>
Date:   Tue Feb 19 16:34:12 2013 +0100

    fix metadata location

 php-pear-Structures-DataGrid-DataSource-MDB2.spec |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/php-pear-Structures-DataGrid-DataSource-MDB2.spec b/php-pear-Structures-DataGrid-DataSource-MDB2.spec
index d2ddb10..a11f242 100644
--- a/php-pear-Structures-DataGrid-DataSource-MDB2.spec
+++ b/php-pear-Structures-DataGrid-DataSource-MDB2.spec
@@ -1,26 +1,30 @@
+%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %global pear_name Structures_DataGrid_DataSource_MDB2
 
 Name:           php-pear-Structures-DataGrid-DataSource-MDB2
 Version:        0.1.11
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        DataSource driver using PEAR::MDB2 and an SQL query
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://pear.php.net/package/%{pear_name}
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.6.0
+
 Requires:       php-pear(PEAR)
 Requires:       php-pear(Structures_DataGrid) >= 0.9.0
 Requires:       php-pear(MDB2) >= 2.4.1
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
+
 Provides:       php-pear(%{pear_name}) = %{version}
 
+
 %description
 This is a DataSource driver for Structures_DataGrid using PEAR::MDB2 and an
 SQL query.
@@ -32,9 +36,6 @@ SQL query.
 mv package2.xml %{pear_name}-%{version}/%{name}.xml
 cd %{pear_name}-%{version}
 
-# Create a "localized" php.ini to avoid build warning
-cp /etc/php.ini .
-echo "date.timezone=UTC" >>php.ini
 
 %build
 cd %{pear_name}-%{version}
@@ -44,10 +45,10 @@ cd %{pear_name}-%{version}
 %install
 cd %{pear_name}-%{version}
 rm -rf $RPM_BUILD_ROOT docdir
-PHPRC=./php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
+%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
 # Clean up unnecessary files
-rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
+rm -rf $RPM_BUILD_ROOT%{pear_metadir}/.??*
 
 # Install XML package description
 install -d $RPM_BUILD_ROOT%{pear_xmldir}
@@ -76,6 +77,9 @@ fi
 
 
 %changelog
+* Tue Feb 19 2013 Remi Collet <remi at fedoraproject.org> - 0.1.11-9
+- fix metadata location
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.11-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list