[php-pear-DB-DataObject-FormBuilder] update to 1.0.2
Remi Collet
remi at fedoraproject.org
Sat Aug 4 15:20:16 UTC 2012
commit 07e943dd626bd61fdfc6f4ae77411e8c0136c0ec
Author: remi <fedora at famillecollet.com>
Date: Sat Aug 4 17:20:10 2012 +0200
update to 1.0.2
.gitignore | 3 ++-
php-pear-DB-DataObject-FormBuilder.spec | 30 +++++++++++++++---------------
sources | 2 +-
xml2changelog | 21 ++++++++++++---------
4 files changed, 30 insertions(+), 26 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 546dd85..8b106ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
-DB_DataObject_FormBuilder-1.0.0.tgz
package*.xml
+*spec~
/DB_DataObject_FormBuilder-1.0.1.tgz
+/DB_DataObject_FormBuilder-1.0.2.tgz
diff --git a/php-pear-DB-DataObject-FormBuilder.spec b/php-pear-DB-DataObject-FormBuilder.spec
index 116aac2..f646ead 100644
--- a/php-pear-DB-DataObject-FormBuilder.spec
+++ b/php-pear-DB-DataObject-FormBuilder.spec
@@ -5,8 +5,8 @@
# DB access is required
Name: php-pear-DB-DataObject-FormBuilder
-Version: 1.0.1
-Release: 4%{?dist}
+Version: 1.0.2
+Release: 1%{?dist}
Summary: Automatically build HTML_QuickForm objects
Group: Development/Libraries
@@ -17,7 +17,7 @@ Source2: xml2changelog
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-BuildRequires: php-pear >= 1:1.4.9-1.2
+BuildRequires: php-pear
Requires: php-pear(PEAR)
Requires: php-pear(DB_DataObject) >= 1.8.5
@@ -27,8 +27,12 @@ Requires: php-pear(HTML_Table) >= 1.7.5
Requires: php-pear(HTML_QuickForm_ElementGrid) >= 0.1.0
Requires(post): %{__pear}
Requires(postun): %{__pear}
+# phpci detected extensions
+Requires: php-date, php-pcre
+
Provides: php-pear(%{pear_name}) = %{version}
+
%description
DB_DataObject_FormBuilder will aid you in rapid application development using
the packages DB_DataObject and HTML_QuickForm. For having a quick but working
@@ -51,10 +55,6 @@ control at any stage of the process.
%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
-
cd %{pear_name}-%{version}
# package.xml is V2
mv ../package.xml %{name}.xml
@@ -66,12 +66,9 @@ cd %{pear_name}-%{version}
%install
-rm -rf $RPM_BUILD_ROOT docdir
+rm -rf $RPM_BUILD_ROOT
cd %{pear_name}-%{version}
-PHPRC=../php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
-
-# Move documentation
-mv $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name} ../docdir
+%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
@@ -102,16 +99,19 @@ fi
%files
%defattr(-,root,root,-)
-%doc CHANGELOG docdir/*
+%doc CHANGELOG
+%doc %{pear_docdir}/%{pear_name}
%{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
+* Sat Aug 04 2012 Remi Collet <remi at fedoraproject.org> - 1.0.2-1
+- Version 1.0.2 (stable) - API 1.0.0 (stable)
+- doc in /usr/share/doc/pear
+
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index 1e9e3e7..d1f607b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3083ac45329c7c6d14877d00f8da2020 DB_DataObject_FormBuilder-1.0.1.tgz
+fb2342e02b93284e457eafd1315a1ff5 DB_DataObject_FormBuilder-1.0.2.tgz
diff --git a/xml2changelog b/xml2changelog
index eb6bd31..3a31be6 100644
--- a/xml2changelog
+++ b/xml2changelog
@@ -7,11 +7,14 @@ $file=array_shift($_SERVER['argv']);
if (in_array("--debug", $_SERVER['argv'])) print_r($xml);
if ($xml['version'] >= "2"){ // Package.xml V 2.0
- printf("*** Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
- $xml->version->release, $xml->stability->release,
- $xml->version->api, $xml->stability->api,
- $xml->date, $xml->notes);
- $new=$xml->version->release;
+ $new = "";
+ if (strlen(trim($xml->notes))>1) { // Ignore too short descr.
+ printf("*** Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
+ $xml->version->release, $xml->stability->release,
+ $xml->version->api, $xml->stability->api,
+ $xml->date, $xml->notes);
+ $new=$xml->version->release;
+ }
if (isset($xml->changelog->release) && count($xml->changelog->release)) {
$tab = array();
@@ -20,14 +23,14 @@ if ($xml['version'] >= "2"){ // Package.xml V 2.0
if ("$old" != "$new") {
$tab[''.$rel->date] = $rel;
}
- }
+ }
krsort($tab);
foreach($tab as $rel) {
printf("*** Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
- $rel->version->release, $rel->stability->release,
- $rel->version->api, $rel->stability->api,
+ $rel->version->release, $rel->stability->release,
+ $rel->version->api, $rel->stability->api,
$rel->date, $rel->notes);
- }
+ }
}
} else { // Package.xml V 1.0
printf("* Version %s (%s) - %s\n\n%s\n\n",
More information about the scm-commits
mailing list