[php-pear-Net-Curl] - rename Net_URL to php-pear-Net-URL.xml - set date.timezone during build

Remi Collet remi at fedoraproject.org
Sun Aug 15 17:51:49 UTC 2010


commit b079172c6f64d8bb129c882979af4d0e0372a5b1
Author: remi <fedora at famillecollet.com>
Date:   Sun Aug 15 19:51:38 2010 +0200

    - rename Net_URL to php-pear-Net-URL.xml
    - set date.timezone during build

 .gitignore             |    1 +
 php-pear-Net-Curl.spec |   24 ++++++++++++++++--------
 2 files changed, 17 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f69ee53..9fd6f08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 Net_Curl-1.2.5.tgz
+package.xml
diff --git a/php-pear-Net-Curl.spec b/php-pear-Net-Curl.spec
index c230ddc..29e50ba 100644
--- a/php-pear-Net-Curl.spec
+++ b/php-pear-Net-Curl.spec
@@ -1,9 +1,9 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define ClassName Net_Curl
+%global ClassName Net_Curl
 
 Name:           php-pear-Net-Curl
 Version:        1.2.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        OO interface to PHP's cURL extension
 
 Group:          Development/Libraries
@@ -25,9 +25,13 @@ Provides an Object-Oriented interface to PHP's curl extension.
 
 %prep
 %setup -qc
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{ClassName}-%{version}/%{ClassName}.xml
+# Create a "localized" php.ini to avoid build warning
+cp /etc/php.ini .
+echo "date.timezone=UTC" >>php.ini
+
 cd %{ClassName}-%{version}
+# Package is V2
+mv ../package.xml %{name}.xml
 
 
 %build
@@ -38,7 +42,7 @@ cd %{ClassName}-%{version}
 %install
 cd %{ClassName}-%{version}
 rm -rf $RPM_BUILD_ROOT docdir
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{ClassName}.xml
+PHPRC=../php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
 # Move documentation
 mkdir -p docdir
@@ -49,7 +53,7 @@ rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
 
 # Install XML package description
 install -d $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 %{ClassName}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 
 %clean
@@ -58,7 +62,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 %{__pear} install --nodeps --soft --force --register-only \
-    %{pear_xmldir}/%{ClassName}.xml >/dev/null ||:
+    %{pear_xmldir}/%{name}.xml >/dev/null ||:
 
 %postun
 if [ "$1" -eq "0" ]; then
@@ -70,12 +74,16 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc %{ClassName}-%{version}/docdir/%{ClassName}/*
-%{pear_xmldir}/%{ClassName}.xml
+%{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/Net
 %{pear_phpdir}/Net/Curl.php
 
 
 %changelog
+* Sun Aug 15 2010 Remi Collet <Fedora at FamilleCollet.com> - 1.2.5-4
+- rename Net_URL to php-pear-Net-URL.xml
+- set date.timezone during build
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


More information about the scm-commits mailing list