[php-pear-DB-DataObject-FormBuilder] Update to 1.0.1 - QA release, packaging only, no change

Remi Collet remi at fedoraproject.org
Fri Oct 29 11:49:18 UTC 2010


commit a9ee33dadc6316d51d8fbb0350e5df8ebda79507
Author: remi <fedora at famillecollet.com>
Date:   Fri Oct 29 13:49:15 2010 +0200

    Update to 1.0.1 - QA release, packaging only, no change

 .gitignore                              |    3 ++-
 php-pear-DB-DataObject-FormBuilder.spec |   23 +++++++++++++++++------
 sources                                 |    2 +-
 3 files changed, 20 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bc8943d..546dd85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 DB_DataObject_FormBuilder-1.0.0.tgz
-package.xml
+package*.xml
+/DB_DataObject_FormBuilder-1.0.1.tgz
diff --git a/php-pear-DB-DataObject-FormBuilder.spec b/php-pear-DB-DataObject-FormBuilder.spec
index cc67d1f..b0075bc 100644
--- a/php-pear-DB-DataObject-FormBuilder.spec
+++ b/php-pear-DB-DataObject-FormBuilder.spec
@@ -1,15 +1,19 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %global pear_name DB_DataObject_FormBuilder
 
+# Test cannot be run during rpmbuild
+# DB access is required
+
 Name:           php-pear-DB-DataObject-FormBuilder
-Version:        1.0.0
-Release:        2%{?dist}
+Version:        1.0.1
+Release:        1%{?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
+Source2:        xml2changelog
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -45,6 +49,8 @@ control at any stage of the process.
 
 %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
@@ -60,13 +66,12 @@ cd %{pear_name}-%{version}
 
 
 %install
-cd %{pear_name}-%{version}
 rm -rf $RPM_BUILD_ROOT docdir
+cd %{pear_name}-%{version}
 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} ../docdir
 
 # Clean up unnecessary files
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
@@ -97,14 +102,20 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
+%doc CHANGELOG docdir/*
 %{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/DB/DataObject/FormBuilder*
 %{pear_testdir}/%{pear_name}
 %{pear_datadir}/%{pear_name}
+# packager stuff http://pear.php.net/bugs/18011
+%exclude %{pear_phpdir}/package.php
 
 
 %changelog
+* Fri Oct 29 2010 Remi Collet <Fedora at FamilleCollet.com> - 1.0.1-1
+- Version 1.0.1 (stable) - API 1.0.0 (stable)
+- add generated Changelog
+
 * Tue Aug 31 2010 Remi Collet <Fedora at FamilleCollet.com> - 1.0.0-2
 - clean define
 - rename DB_DataObject_FormBuilder.xml 
diff --git a/sources b/sources
index 12a0e16..1e9e3e7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-87feb6eac19a8d318152d68e44fcf658  DB_DataObject_FormBuilder-1.0.0.tgz
+3083ac45329c7c6d14877d00f8da2020  DB_DataObject_FormBuilder-1.0.1.tgz


More information about the scm-commits mailing list