[php-pear-Net-POP3] clean spec

[Remi Collet]

commit bba7379977ce2c56aee5fcbfa0faf8c6c1ff563b
Author: remi <fedora at famillecollet.com>
Date:   Wed Aug 18 20:02:26 2010 +0200

    clean spec

 .gitignore             |    1 +
 php-pear-Net-POP3.spec |   25 +++++++++++++++++--------
 2 files changed, 18 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f05f7fb..bdba454 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 Net_POP3-1.3.7.tgz
+package.xml
diff --git a/php-pear-Net-POP3.spec b/php-pear-Net-POP3.spec
index 2117d08..4ab6f41 100644
--- a/php-pear-Net-POP3.spec
+++ b/php-pear-Net-POP3.spec
@@ -1,9 +1,9 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define pear_name Net_POP3
+%global pear_name Net_POP3
 
 Name:           php-pear-Net-POP3
 Version:        1.3.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Provides a POP3 class to access POP3 server
 
 Group:          Development/Languages
@@ -29,9 +29,13 @@ optional Auth_SASL package.
 
 %prep
 %setup -qc
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
+# Create a "localized" php.ini to avoid build warning
+cp /etc/php.ini .
+echo "date.timezone=UTC" >>php.ini
+
 cd %{pear_name}-%{version}
+# Package.xml is V2
+mv ../package.xml %{name}.xml
 
 
 %build
@@ -42,7 +46,7 @@ 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
 
 # Move documentation
 mkdir -p docdir
@@ -53,7 +57,7 @@ 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
@@ -62,7 +66,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
@@ -74,11 +78,16 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc %{pear_name}-%{version}/docdir/%{pear_name}/*
-%{pear_xmldir}/%{pear_name}.xml
+%{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/Net/POP3.php
 
 
 %changelog
+* Wed Aug 18 2010 Remi Collet <Fedora at FamilleCollet.com> - 1.3.7-2
+- rename Net_POP3.xml to php-pear-Net-POP3.xml
+- set date.timezone during build
+- clean define
+
 * Mon Sep 07 2009 Christopher Stone <chris.stone at gmail.com> 1.3.7-1
 - Upstream sync
 - Remove test dir