[php-pear-HTML-QuickForm/el6/master] clean spec

[Remi Collet]

commit daf95a1ed82c836d6c54e2dabab8166d725ecef3
Author: remi <fedora at famillecollet.com>
Date:   Sat Aug 28 14:08:04 2010 +0200

    clean spec

 .gitignore                   |    1 +
 PHP-LICENSE-3.01             |   68 ------------------------------------------
 php-pear-HTML-QuickForm.spec |   35 +++++++++++++--------
 3 files changed, 23 insertions(+), 81 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3e39f4e..503123d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 HTML_QuickForm-3.2.11.tgz
+package.xml
diff --git a/php-pear-HTML-QuickForm.spec b/php-pear-HTML-QuickForm.spec
index 6037fa4..29d8015 100644
--- a/php-pear-HTML-QuickForm.spec
+++ b/php-pear-HTML-QuickForm.spec
@@ -1,20 +1,20 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define pear_name HTML_QuickForm
+%global pear_name HTML_QuickForm
 
 Name:           php-pear-HTML-QuickForm
 Version:        3.2.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Class for creating, validating, processing HTML forms
 
 Group:          Development/Libraries
 License:        PHP
 URL:            http://pear.php.net/package/HTML_QuickForm
 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) php-pear(HTML_Common) >= 1.2.1
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
@@ -29,7 +29,7 @@ Features:
 * XHTML compliant generated code.
 * Numerous mixable and extendable validation rules.
 * Automatic server-side validation and filtering.
-* On request javascript code generation for client-side validation.
+* On request JavaScript code generation for client-side validation.
 * File uploads support.
 * Total customization of form rendering.
 * Support for external template engines (ITX, Sigma, Flexy, Smarty).
@@ -38,10 +38,13 @@ Features:
 
 %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
@@ -52,7 +55,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
@@ -65,7 +68,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}
 
 
 %clean
@@ -74,7 +77,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
@@ -85,12 +88,18 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE %{pear_name}-%{version}/docdir/%{pear_name}/docs
-%{pear_xmldir}/%{pear_name}.xml
+%doc %{pear_name}-%{version}/docdir/%{pear_name}/docs
+%{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/HTML/QuickForm*
 
 
 %changelog
+* Sat Aug 28 2010 Remi Collet <Fedora at FamilleCollet.com> - 3.2.11-2
+- clean define
+- remove LICENSE (not provided by upstream)
+- rename HTML_QuickForm.xml to php-pear-HTML-QuickForm.xml
+- set date.timezone during build
+
 * Sat Sep 05 2009 Christopher Stone <chris.stone at gmail.com> 3.2.11-1
 - Upstream sync
 - Fix line endings in docs