rpms/php-pear-Net-SMTP/FC-6 xml2changelog, NONE, 1.1 php-pear-Net-SMTP.spec, 1.2, 1.3 sources, 1.2, 1.3

[Remi Collet (remi)]

Author: remi

Update of /cvs/extras/rpms/php-pear-Net-SMTP/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29248

Modified Files:
	php-pear-Net-SMTP.spec sources 
Added Files:
	xml2changelog 
Log Message:
New version 1.2.10


--- NEW FILE xml2changelog ---
<?php
$prog=array_shift($_SERVER['argv']);
if ($_SERVER['argc']<2) die ("usage : " . $prog . " path_to_package.xml [ --debug ]\n");
$file=array_shift($_SERVER['argv']);

($xml=simplexml_load_file($file)) || die ($file . " not found !\n");
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);

	foreach($xml->changelog->release 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->date, $rel->notes);
} else { // Package.xml V 1.0
	printf("* Version %s (%s) - %s\n\n%s\n\n",
		$xml->release->version, $xml->release->state, $xml->release->date, $xml->release->notes);

	foreach($xml->changelog->release as $rel)
		printf("* Version %s (%s) - %s\n\n%s\n\n",
			$rel->version, $rel->state, $rel->date, $rel->notes);
}
?>


Index: php-pear-Net-SMTP.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-SMTP/FC-6/php-pear-Net-SMTP.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pear-Net-SMTP.spec	8 Sep 2006 17:17:17 -0000	1.2
+++ php-pear-Net-SMTP.spec	31 Mar 2007 06:24:55 -0000	1.3
@@ -1,29 +1,28 @@
-# default values when new /etc/rpm/macros.pear not present
-%{!?__pear:       %define __pear       %{_bindir}/pear}
-%{!?pear_phpdir:  %define pear_phpdir  %(%{__pear} config-get php_dir  2> /dev/null || echo undefined)}
-%{!?pear_docdir:  %define pear_docdir  %(%{__pear} config-get doc_dir  2> /dev/null || echo undefined)}
-%{!?pear_testdir: %define pear_testdir %(%{__pear} config-get test_dir 2> /dev/null || echo undefined)}
-%{!?pear_datadir: %define pear_datadir %(%{__pear} config-get data_dir 2> /dev/null || echo undefined)}
-%{!?pear_xmldir:  %define pear_xmldir  %{pear_phpdir}/.pkgxml}
-
-Summary:      PEAR: Provides an implementation of the SMTP protocol
-Summary(fr):  PEAR: Fournit une mise en oeuvre du protocol SMTP
-Name:         php-pear-Net-SMTP
-Version:      1.2.8
-Release:      5%{?dist}
-License:      PHP License
-Group:        Development/Libraries
-Source:       http://pear.php.net/get/Net_SMTP-%{version}.tgz
-Source1:      PHP-LICENSE-3.01
-BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-URL:          http://pear.php.net/package/Net_SMTP
-
-BuildArch:        noarch
-BuildRequires:    php-pear(PEAR) >= 1.4.9
-Requires:         php-pear(PEAR) >= 1.4.9, php-pear(Net_Socket), php-pear(Auth_SASL), php >= 4.0.5
-Requires(post):   %{__pear}
+%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
+%define pear_name Net_SMTP
+
+Name:           php-pear-Net-SMTP
+Version:        1.2.10
+Release:        1%{?dist}
+Summary:        Provides an implementation of the SMTP protocol
+Summary(fr):    Fournit une mise en oeuvre du protocol SMTP
+
+Group:          Development/Libraries
+License:        PHP License
+URL:            http://pear.php.net/package/Net_SMTP
+Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
+Source1:        PHP-LICENSE-3.01
+Source2:        xml2changelog
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:      noarch
+BuildRequires:  php-pear >= 1:1.4.9-1.2
+Requires(post): %{__pear}
 Requires(postun): %{__pear}
-Provides:         php-pear(Net_SMTP) = %{version}
+Provides:       php-pear(%{pear_name}) = %{version}
+Requires:       php-pear(PEAR) >= 1.4.9, php-pear(Net_Socket) >= 1.0.7
+Requires:       php-pear(Auth_SASL)
+
 
 %description
 Provides an implementation of the SMTP protocol using PEAR's Net_Socket class.
@@ -36,20 +35,25 @@
 php-pear-Net-SMTP peut optionellement utiliser
 l'extension "php-pear-Auth-SASL".
 
-%prep
-%setup -c -q
-mv package2.xml Net_SMTP-%{version}/Net_SMTP.xml
 
+%prep
+%setup -q -c
+%{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
 %{__install} -m 644 -c %{SOURCE1} LICENSE
 
+mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
+
+
 %build
-# Empty build section
+cd %{pear_name}-%{version}
+# Empty build section, most likely nothing required.
+
 
 %install
 rm -rf %{buildroot} docdir
 
-pushd Net_SMTP-%{version}
-%{__pear} install --nodeps --packagingroot %{buildroot} Net_SMTP.xml
+pushd %{pear_name}-%{version}
+%{__pear} install --nodeps --packagingroot %{buildroot} %{pear_name}.xml
 
 # Clean up unnecessary files
 rm -rf %{buildroot}%{pear_phpdir}/.??*
@@ -63,31 +67,45 @@
 %{__mkdir} docdir
 mv %{buildroot}%{pear_docdir}/* docdir
 
+
 %check
 # Sanity check
 lst=$(find %{buildroot}%{pear_phpdir} -exec grep -q %{buildroot} {} \; -print)
 [ ! -z "$lst" ] && echo "Reference to BUILDROOT in $lst" && exit 1;
 
+
 %clean
 rm -rf %{buildroot}
 
+
 %post
-%{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/Net_SMTP.xml >/dev/null || :
+%{__pear} install --nodeps --soft --force --register-only \
+    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :
 
 %postun
-# if refcount = 0 then package has been removed (not upgraded)
-if [ "$1" -eq "0" ]; then
-   %{__pear} uninstall --nodeps --ignore-errors --register-only Net_SMTP >/dev/null || :
+if [ $1 -eq 0 ] ; then
+    %{__pear} uninstall --nodeps --ignore-errors --register-only \
+        %{pear_name} >/dev/null || :
 fi
 
+
 %files
 %defattr(-,root,root,-)
-%doc LICENSE docdir/Net_SMTP/docs/*
-%{pear_phpdir}/Net
-%{pear_testdir}/Net_SMTP
-%{pear_xmldir}/Net_SMTP.xml
+%doc CHANGELOG LICENSE docdir/%{pear_name}/docs/*
+%{pear_phpdir}/Net/*
+%{pear_testdir}/%{pear_name}
+%{pear_xmldir}/%{pear_name}.xml
+
 
 %changelog
+* Sat Mar 31 2007 Remi Collet <Fedora at FamilleCollet.com> 1.2.10-1
+- remove PEAR from sumnary
+- update to 1.2.10 
+- requires Net_Socket >= 1.0.7
+- spec cleanup
+- add generated CHANGELOG
+- don't own /usr/share/pear/Net (already own by Net_Socket)
+
 * Fri Sep 08 2006 Remi Collet <Fedora at FamilleCollet.com> 1.2.8-5
 - last template.spec
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-SMTP/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Sep 2006 16:26:41 -0000	1.2
+++ sources	31 Mar 2007 06:24:55 -0000	1.3
@@ -1 +1 @@
-acd7c31aa6a083ff6bff86ffba02bcbb  Net_SMTP-1.2.8.tgz
+cd12642ea13e2ec3939688b988fd39c4  Net_SMTP-1.2.10.tgz