rpms/php-pear-Mail-Mime/F-11 php-pear-Mail-Mime.spec, 1.7, 1.8 sources, 1.4, 1.5 PHP-LICENSE-3.01, 1.1, NONE

[Remi Collet]

Author: remi

Update of /cvs/pkgs/rpms/php-pear-Mail-Mime/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30121

Modified Files:
	php-pear-Mail-Mime.spec sources 
Removed Files:
	PHP-LICENSE-3.01 
Log Message:
update to 1.5.3 + spec cleanup


Index: php-pear-Mail-Mime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Mail-Mime/F-11/php-pear-Mail-Mime.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- php-pear-Mail-Mime.spec	26 Feb 2009 21:40:32 -0000	1.7
+++ php-pear-Mail-Mime.spec	30 Dec 2009 16:46:08 -0000	1.8
@@ -1,21 +1,20 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 
 Name:		php-pear-Mail-Mime
-Version:	1.5.2
-Release:	5%{?dist}
+Version:	1.5.3
+Release:	1%{?dist}
 Summary:	Classes to create and decode mime messages
 
 Group:		Development/Libraries
-License:	PHP
+License:	BSD
 URL:		http://pear.php.net/package/Mail_Mime
 Source0:	http://pear.php.net/get/Mail_Mime-%{version}.tgz
-Source1:	PHP-LICENSE-3.01
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
 BuildRequires:	php-pear >= 1:1.4.9-1.2
 Requires:	php-pear(PEAR) >= 1.6.0
-Requires:	php-pear(Mail_mimeDecode)
 Requires(post):	%{__pear}
 Requires(postun): %{__pear}
 Provides:	php-pear(Mail_Mime) = %{version}
@@ -26,42 +25,57 @@ a simple API for creating such emails, t
 suffice. Else you can use Mail_mimePart, which gives you better control about
 MIME creation
 
+
 %prep
-%setup -q -c -n Mail_Mime-%{version}
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml Mail_Mime-%{version}/Mail_Mime.xml
+%setup -q -c 
+# package.xml is v2
+mv package.xml Mail_Mime-%{version}/%{name}.xml
+
 
-# Empty build section, nothing required
 %build
+# Empty build section, nothing required
+
 
 %install
 rm -rf %{buildroot} docdir
 
 cd Mail_Mime-%{version}
-%{__pear} install --nodeps --packagingroot %{buildroot} Mail_Mime.xml
+%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Move documentation
 mkdir -p docdir
 mv %{buildroot}%{pear_docdir}/* docdir
-%{__install} -m 644 -c %{SOURCE1} docdir/Mail_Mime/LICENSE
+
+sed -i -e 's:@prefix@:%{_prefix}:' docdir/Mail_Mime/scripts/phail.php
 
 # Clean up unnecessary files
 rm -rf %{buildroot}%{pear_phpdir}/.??*
 
 # Install XML package description
 mkdir -p %{buildroot}%{pear_xmldir}
-install -pm 644 Mail_Mime.xml %{buildroot}%{pear_xmldir}
+install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
+
 
 %check
 # Sanity check
 lst=$(find %{buildroot}%{pear_xmldir} -exec grep -q %{buildroot} {} \; -print)
 [ ! -z "$lst" ] && echo "Reference to BUILDROOT in $lst" && exit 1;
 
+# For documentation purpose only
+# After install, as root :
+# pear run-tests -p Mail_Mime
+# Should return (1.5.3)
+# 24 PASSED TESTS
+# 1 SKIPPED TESTS
+
+
 %clean
 rm -rf %{buildroot}
 
+
 %post
-%{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/Mail_Mime.xml >/dev/null ||:
+%{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/%{name}.xml >/dev/null ||:
+
 
 %postun
 # if refcount = 0 then package has been removed (not upgraded)
@@ -69,15 +83,24 @@ if [ "$1" -eq "0" ]; then
 	%{__pear} uninstall --nodeps --ignore-errors --register-only Mail_Mime >/dev/null ||:
 fi
 
+
 %files
 %defattr(-,root,root,-)
 %doc Mail_Mime-%{version}/docdir/Mail_Mime/*
-%{pear_xmldir}/Mail_Mime.xml
+%{pear_xmldir}/%{name}.xml
 %{pear_testdir}/Mail_Mime
 %{pear_datadir}/Mail_Mime
 %{pear_phpdir}/Mail
 
+
 %changelog
+* Wed Dec 30 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.5.3-1
+- update to new upstream version
+- remove circular dependency on Mail_mimeDecode
+- rename Mail_Mime.xml to php-pear-Mail-Mime.xml
+- fix License (BSD, not PHP, since 1.4.0)
+- fix missing URL
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-Mail-Mime/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	6 Sep 2007 05:48:24 -0000	1.4
+++ sources	30 Dec 2009 16:46:08 -0000	1.5
@@ -1 +1 @@
-30b931f620d880782ee8d5e454b51fdf  Mail_Mime-1.5.2.tgz
+bc2ba060efca4f23e2651d682fa985ef  Mail_Mime-1.5.3.tgz


--- PHP-LICENSE-3.01 DELETED ---