[php-pear-DB-DataObject-FormBuilder] clean spec

[Remi Collet]

commit 7af09d2de848d28bd0a134a3be69fd4e2e4b81fa
Author: remi <fedora at famillecollet.com>
Date:   Tue Aug 31 19:57:29 2010 +0200

    clean spec

 .gitignore                              |    1 +
 php-pear-DB-DataObject-FormBuilder.spec |   36 ++++++++++++++++++++----------
 2 files changed, 25 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 00df3ed..bc8943d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 DB_DataObject_FormBuilder-1.0.0.tgz
+package.xml
diff --git a/php-pear-DB-DataObject-FormBuilder.spec b/php-pear-DB-DataObject-FormBuilder.spec
index 031ec80..cc67d1f 100644
--- a/php-pear-DB-DataObject-FormBuilder.spec
+++ b/php-pear-DB-DataObject-FormBuilder.spec
@@ -1,25 +1,26 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define pear_name DB_DataObject_FormBuilder
+%global pear_name DB_DataObject_FormBuilder
 
 Name:           php-pear-DB-DataObject-FormBuilder
 Version:        1.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Automatically build HTML_QuickForm objects
 
 Group:          Development/Libraries
 License:        LGPLv2
 URL:            http://pear.php.net/package/DB_DataObject_FormBuilder
 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.4.9-1.2
+
 Requires:       php-pear(PEAR)
 Requires:       php-pear(DB_DataObject) >= 1.8.5
 Requires:       php-pear(HTML_QuickForm) >= 3.2.4
-Requires(hint): php-pear(Date) >= 1.4.7
-Requires(hint): php-pear(HTML_Table) >= 1.7.5
-Requires(hint): php-pear(HTML_QuickForm_ElementGrid) >= 0.1.0
+Requires:       php-pear(Date) >= 1.4.7
+Requires:       php-pear(HTML_Table) >= 1.7.5
+Requires:       php-pear(HTML_QuickForm_ElementGrid) >= 0.1.0
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Provides:       php-pear(%{pear_name}) = %{version}
@@ -44,9 +45,13 @@ control at any stage of the process.
 
 %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
@@ -57,7 +62,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
@@ -68,7 +73,7 @@ rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
 
 # Install XML package description
 install -d $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}
 
 # Fix rpmlint Errors
 chmod +x $RPM_BUILD_ROOT%{pear_datadir}/%{pear_name}/tools/*.php
@@ -80,7 +85,8 @@ 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
@@ -92,13 +98,19 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc %{pear_name}-%{version}/docdir/%{pear_name}/*
-%{pear_xmldir}/%{pear_name}.xml
+%{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/DB/DataObject/FormBuilder*
 %{pear_testdir}/%{pear_name}
 %{pear_datadir}/%{pear_name}
 
 
 %changelog
+* Tue Aug 31 2010 Remi Collet <Fedora at FamilleCollet.com> - 1.0.0-2
+- clean define
+- rename DB_DataObject_FormBuilder.xml 
+  to php-pear-DB-DataObject-FormBuilder.xml
+- set date.timezone during build
+
 * Sat Sep 05 2009 Christopher Stone <chris.stone at gmail.com> 1.0.0-1
 - Upstream sync