[php-pear-Mail-mimeDecode/f13/master] update to 1.5.3 (Major Bugfix release)

Remi Collet remi at fedoraproject.org
Sun Sep 5 11:13:07 UTC 2010


commit a756a9ce75b21a589324044582acd594d2fb917a
Author: remi <fedora at famillecollet.com>
Date:   Sun Sep 5 12:37:19 2010 +0200

    update to 1.5.3 (Major Bugfix release)

 .gitignore                    |    1 +
 php-pear-Mail-mimeDecode.spec |   42 ++++++++++++++++++++++++++++++++--------
 sources                       |    2 +-
 3 files changed, 35 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bc3a88e..0f86ce0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 Mail_mimeDecode-1.5.1.tgz
+/Mail_mimeDecode-1.5.3.tgz
diff --git a/php-pear-Mail-mimeDecode.spec b/php-pear-Mail-mimeDecode.spec
index 39de7dc..b438e46 100644
--- a/php-pear-Mail-mimeDecode.spec
+++ b/php-pear-Mail-mimeDecode.spec
@@ -1,23 +1,27 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 
+%global pear_name Mail_mimeDecode
 Name:		php-pear-Mail-mimeDecode
-Version:	1.5.1
+Version:	1.5.3
 Release:	1%{?dist}
 Summary:	Class to decode mime messages
 
 Group:		Development/Libraries
 License:	BSD
 URL:		http://pear.php.net/package/Mail_mimeDecode
-Source0:	http://pear.php.net/get/Mail_mimeDecode-%{version}.tgz
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:	http://pear.php.net/get/%{pear_name}-%{version}.tgz
 
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires:	php-pear >= 1:1.6.0
+# BR for tests
+BuildRequires:	php-pear(Mail_Mime) > 1.4.0
+
 Requires:	php-pear(PEAR) >= 1.6.0
 Requires:	php-pear(Mail_Mime) > 1.4.0
 Requires(post):	%{__pear}
 Requires(postun): %{__pear}
-Provides:	php-pear(Mail_mimeDecode) = %{version}
+Provides:	php-pear(%{pear_name}) = %{version}
 
 
 %description
@@ -30,8 +34,13 @@ pear run-tests -p Mail_mimeDecode
 
 %prep
 %setup -q -c
+# 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 Mail_mimeDecode-%{version}/%{name}.xml
+mv ../package.xml %{name}.xml
 
 
 # Empty build section, nothing required
@@ -41,8 +50,10 @@ mv package.xml Mail_mimeDecode-%{version}/%{name}.xml
 %install
 rm -rf %{buildroot} docdir
 
-cd Mail_mimeDecode-%{version}
-%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
+cd %{pear_name}-%{version}
+PHPRC=../php.ini %{__pear} install \
+   --nodeps \
+   --packagingroot %{buildroot} %{name}.xml
 
 # Clean up unnecessary files
 rm -rf %{buildroot}%{pear_phpdir}/.??*
@@ -53,10 +64,17 @@ install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 
 %check
+cd %{pear_name}-%{version}
+
 # Sanity check
 lst=$(find %{buildroot}%{pear_xmldir} -exec grep -q %{buildroot} {} \; -print)
 [ ! -z "$lst" ] && echo "Reference to BUILDROOT in $lst" && exit 1;
 
+# Test suite
+PHPRC=../php.ini %{__pear} run-tests \
+   -i "-d include_path=%{buildroot}%{pear_phpdir}:%{pear_phpdir}" \
+   tests
+
 
 %clean
 rm -rf %{buildroot}
@@ -69,18 +87,24 @@ rm -rf %{buildroot}
 %postun
 # if refcount = 0 then package has been removed (not upgraded)
 if [ "$1" -eq "0" ]; then
-	%{__pear} uninstall --nodeps --ignore-errors --register-only Mail_mimeDecode >/dev/null ||:
+	%{__pear} uninstall --nodeps --ignore-errors --register-only %{pear_name} >/dev/null ||:
 fi
 
 
 %files
 %defattr(-,root,root,-)
 %{pear_xmldir}/%{name}.xml
-%{pear_testdir}/Mail_mimeDecode
+%{pear_testdir}/%{pear_name}
 %{pear_phpdir}/Mail/mimeDecode.php
 
 
 %changelog
+* Sun Sep 05 2010 Remi Collet <Fedora at FamilleCollet.com> 1.5.3-1
+- update to 1.5.3 (Major Bugfix release)
+- define pear_name macro
+- set date.timezone during build
+- run test during %%check
+
 * Thu Dec 03 2009 Remi Collet <Fedora at FamilleCollet.com> 1.5.1-1
 - update to 1.5.1
 - rename Mail_mimeDecode.xml to php-pear-Mail-mimeDecode.xml
diff --git a/sources b/sources
index 1152fb5..14567cb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0a8e7bc71dd78a2811b34cbe2d4b0792  Mail_mimeDecode-1.5.1.tgz
+ba160f584b94c00733fa06698dee8c02  Mail_mimeDecode-1.5.3.tgz


More information about the scm-commits mailing list