[php-pear-Structures-DataGrid-DataSource-RSS] cleaning up spec file

Christof Damian cdamian at fedoraproject.org
Fri Aug 20 16:58:42 UTC 2010


commit 2d7449f780a801410c4a73da26665b3b42622b54
Author: Christof Damian <christof at damian.net>
Date:   Fri Aug 20 18:58:30 2010 +0200

    cleaning up spec file

 php-pear-Structures-DataGrid-DataSource-RSS.spec |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)
---
diff --git a/php-pear-Structures-DataGrid-DataSource-RSS.spec b/php-pear-Structures-DataGrid-DataSource-RSS.spec
index 8e680cd..49baf32 100644
--- a/php-pear-Structures-DataGrid-DataSource-RSS.spec
+++ b/php-pear-Structures-DataGrid-DataSource-RSS.spec
@@ -1,14 +1,14 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define pear_name Structures_DataGrid_DataSource_RSS
+%global pear_name Structures_DataGrid_DataSource_RSS
 
 Name:           php-pear-Structures-DataGrid-DataSource-RSS
 Version:        0.1.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        DataSource driver using RSS files
 
 Group:          Development/Libraries
 License:        BSD
-URL:            http://pear.php.net/package/Structures_DataGrid_DataSource_RSS
+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)
 
@@ -29,9 +29,12 @@ This is a DataSource driver for Structures_DataGrid using RSS files.
 %prep
 %setup -q -c
 [ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
+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}
@@ -41,14 +44,14 @@ cd %{pear_name}-%{version}
 %install
 cd %{pear_name}-%{version}
 rm -rf $RPM_BUILD_ROOT docdir
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
+PHPRC=./php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
 # Clean up unnecessary files
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
 
 # Install XML package description
 mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 
 %clean
@@ -57,7 +60,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 %{__pear} install --nodeps --soft --force --register-only \
-    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :
+    %{pear_xmldir}/%{name}.xml >/dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
@@ -68,11 +71,14 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%{pear_xmldir}/%{pear_name}.xml
+%{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/Structures/DataGrid/DataSource/*
 
 
 %changelog
+* Fri Aug 20 2010 Christof Damian <christof at damian.net> - 0.1.1-4
+- spec cleaning
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


More information about the scm-commits mailing list