[php-pear-DB-DataObject/el6/master] clean spec

[Remi Collet]

commit 068ff02059804acd16a7dcf131b03954bcf7912a
Author: remi <fedora at famillecollet.com>
Date:   Sat Aug 28 16:05:49 2010 +0200

    clean spec

 .gitignore                  |    1 +
 PHP-LICENSE-3.01            |   68 -------------------------------------------
 php-pear-DB-DataObject.spec |   43 +++++++++++++++++---------
 3 files changed, 29 insertions(+), 83 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4bad969..f7da0ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 DB_DataObject-1.8.12.tgz
+package.xml
diff --git a/php-pear-DB-DataObject.spec b/php-pear-DB-DataObject.spec
index 6591eec..7ad4a84 100644
--- a/php-pear-DB-DataObject.spec
+++ b/php-pear-DB-DataObject.spec
@@ -1,27 +1,30 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define pear_name DB_DataObject
+%global pear_name DB_DataObject
 
 Name:           php-pear-DB-DataObject
 Version:        1.8.12
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An SQL Builder, Object Interface to Database Tables
 
 Group:          Development/Libraries
 License:        PHP
 URL:            http://pear.php.net/package/DB_DataObject
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
-Source1:        PHP-LICENSE-3.01
-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) >= 1.7.0, php-pear(Date) >= 1.4.3
-Requires(hint): php-pear(MDB2) >= 2.0.0, php-pear(Validate) >= 0.1.1
+Requires:       php-pear(DB) >= 1.7.0, 
+Requires:       php-pear(Date) >= 1.4.3
+Requires:       php-pear(MDB2) >= 2.0.0
+Requires:       php-pear(Validate) >= 0.1.1
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Provides:       php-pear(%{pear_name}) = %{version}
 
+
 %description
 DataObject performs 2 tasks:
 1. Builds SQL statements based on the objects vars and the builder methods.
@@ -34,10 +37,13 @@ your configuration files and your base classes.
 
 %prep
 %setup -qc
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
-install -pm 644 -c %{SOURCE1} LICENSE
+# 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
@@ -48,7 +54,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
@@ -59,9 +65,9 @@ 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}
 
-# Move createTables script to %{bindir}
+# Move createTables script to /usr/bin
 mv $RPM_BUILD_ROOT%{pear_phpdir}/DB/DataObject/createTables.php $RPM_BUILD_ROOT%{_bindir}
 chmod +x $RPM_BUILD_ROOT%{_bindir}/createTables.php
 ln -s ../../../../..%{_bindir}/createTables.php $RPM_BUILD_ROOT%{pear_phpdir}/DB/DataObject/
@@ -73,7 +79,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
@@ -84,14 +90,21 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE %{pear_name}-%{version}/docdir/%{pear_name}/docs/*
+%doc %{pear_name}-%{version}/docdir/%{pear_name}/docs/*
 %{_bindir}/createTables.php
-%{pear_xmldir}/%{pear_name}.xml
+%{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/DB/DataObject*
 %exclude %{_bindir}/DB/scripts/DB_DataObject_createTables.bat
 
 
 %changelog
+* Sat Aug 28 2010 Remi Collet <Fedora at FamilleCollet.com> - 1.8.12-2
+- clean define
+- remove LICENSE file (not provided by upstream)
+- rename DB_DataObject.xml to php-pear-DB-DataObject.xml
+- set date.timezone during build
+
+
 * Sun Aug 30 2009 Christopher Stone <chris.stone at gmail.com> 1.8.12-1
 - Upstream sync