[php-pear-HTML-QuickForm/el6/master] update to 3.2.12 (bugfix)
Remi Collet
remi at fedoraproject.org
Sun Oct 17 08:48:58 UTC 2010
commit 953fe4b7fe3b36f0b66ead9ee9c74db2b1ae0eca
Author: remi <fedora at famillecollet.com>
Date: Sun Oct 17 10:48:49 2010 +0200
update to 3.2.12 (bugfix)
.gitignore | 1 +
php-pear-HTML-QuickForm.spec | 22 +++++++++++++++-------
sources | 2 +-
3 files changed, 17 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 503123d..94e685d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
HTML_QuickForm-3.2.11.tgz
package.xml
+/HTML_QuickForm-3.2.12.tgz
diff --git a/php-pear-HTML-QuickForm.spec b/php-pear-HTML-QuickForm.spec
index 29d8015..e826086 100644
--- a/php-pear-HTML-QuickForm.spec
+++ b/php-pear-HTML-QuickForm.spec
@@ -2,20 +2,22 @@
%global pear_name HTML_QuickForm
Name: php-pear-HTML-QuickForm
-Version: 3.2.11
-Release: 2%{?dist}
+Version: 3.2.12
+Release: 1%{?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
+Source2: xml2changelog
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: php-pear(PEAR)
+Requires: php-pear(HTML_Common) >= 1.2.1
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides: php-pear(%{pear_name}) = %{version}
@@ -38,6 +40,8 @@ Features:
%prep
%setup -qc
+%{_bindir}/php -n %{SOURCE2} package.xml | tee CHANGELOG | head -n 10
+
# Create a "localized" php.ini to avoid build warning
cp /etc/php.ini .
echo "date.timezone=UTC" >>php.ini
@@ -53,15 +57,15 @@ cd %{pear_name}-%{version}
%install
+rm -rf $RPM_BUILD_ROOT docs
cd %{pear_name}-%{version}
-rm -rf $RPM_BUILD_ROOT docdir
PHPRC=../php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
# Move documentation
mkdir -p docdir
-mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
+mv $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name}/docs ../docs
# fix line endings
-find docdir/HTML_QuickForm/docs -type f -exec sed -i 's/\r//' {} \;
+find ../docs -type f -exec sed -i 's/\r//' {} \;
# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
@@ -88,12 +92,16 @@ fi
%files
%defattr(-,root,root,-)
-%doc %{pear_name}-%{version}/docdir/%{pear_name}/docs
+%doc CHANGELOG docs
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/HTML/QuickForm*
%changelog
+* Sun Oct 17 2010 Remi Collet <Fedora at FamilleCollet.com> - 3.2.12-1
+- Version 3.2.12 (stable) - API 3.2.6 (stable)
+- add generated Changelog
+
* Sat Aug 28 2010 Remi Collet <Fedora at FamilleCollet.com> - 3.2.11-2
- clean define
- remove LICENSE (not provided by upstream)
diff --git a/sources b/sources
index 7394125..0622c77 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2320341c734fec60549a3e5145fbe8e7 HTML_QuickForm-3.2.11.tgz
+5742a1e1a7400120bf48ffcd4acaf1d8 HTML_QuickForm-3.2.12.tgz
More information about the scm-commits
mailing list