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

Remi Collet (remi) fedora-extras-commits at redhat.com
Sat Mar 31 06:23:02 UTC 2007


Author: remi

Update of /cvs/extras/rpms/php-pear-Net-Socket/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29172

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


--- 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-Socket.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-Socket/FC-5/php-pear-Net-Socket.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pear-Net-Socket.spec	8 Sep 2006 17:51:26 -0000	1.2
+++ php-pear-Net-Socket.spec	31 Mar 2007 06:22:27 -0000	1.3
@@ -1,84 +1,102 @@
-# 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: Network Socket Interface
-Summary(fr):  PEAR: gestion des "sockets" réseaux
-Name:         php-pear-Net-Socket
-Version:      1.0.6
-Release:      5%{?dist}
-License:      PHP License
-Group:        Development/Libraries
-Source:       http://pear.php.net/get/Net_Socket-%{version}.tgz
-Source1:      PHP-LICENSE-3.01
-BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-URL:          http://pear.php.net/package/Net_Socket
-
-BuildArch:        noarch
-BuildRequires:    php-pear(PEAR) >= 1.4.9
-Requires:         php-pear(PEAR) >= 1.4.9, php >= 4.3.0
-Requires(post):   %{__pear}
+%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
+%define pear_name Net_Socket
+
+Name:           php-pear-Net-Socket
+Version:        1.0.7
+Release:        1%{?dist}
+Summary:        Network Socket Interface
+Summary(fr):    Gestion des "sockets" réseaux
+
+Group:          Development/Libraries
+License:        PHP License
+URL:            http://pear.php.net/package/Net_Socket
+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_Socket) = %{version}
+Provides:       php-pear(%{pear_name}) = %{version}
+
 
 %description
-Net_Socket is a class interface to TCP sockets.  It provides blocking
-and non-blocking operation, with different reading and writing modes
-(byte-wise, block-wise, line-wise and special formats like network
-byte-order ip addresses).
+  Net_Socket is a class interface to TCP sockets.  It provides blocking
+  and non-blocking operation, with different reading and writing modes
+  (byte-wise, block-wise, line-wise and special formats like network
+  byte-order ip addresses).
 
 %description -l fr
-Net_Socket est une classe d'interface sur les "sockets" TCP.
-Elle gère les opérations bloquantes et non bloquantes, avec plusieurs
-modes de lecture et d'écriture (par octet, par bloc, par ligne, et
-des formats spéciaux, comme les adresses IP dans l'ordre des
-octets du réseau).
+  Net_Socket est une classe d'interface sur les "sockets" TCP.
+  Elle gère les opérations bloquantes et non bloquantes, avec plusieurs
+  modes de lecture et d'écriture (par octet, par bloc, par ligne, et
+  des formats spéciaux, comme les adresses IP dans l'ordre des
+  octets du réseau).
 
-%prep
-%setup -c -q
-mv package.xml Net_Socket-%{version}/Net_Socket.xml
 
+%prep
+%setup -q -c
+%{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG
 %{__install} -m 644 -c %{SOURCE1} LICENSE
 
+mv package.xml %{pear_name}-%{version}/%{pear_name}.xml
+
+
+%build
+cd %{pear_name}-%{version}
+# Empty build section, most likely nothing required.
+
+
 %install
 rm -rf %{buildroot}
 
 cd Net_Socket-%{version}
-%{__pear} install --nodeps --packagingroot %{buildroot} Net_Socket.xml
+%{__pear} install --nodeps --packagingroot %{buildroot} %{pear_name}.xml
 
 # Clean up unnecessary files
 rm -rf %{buildroot}%{pear_phpdir}/.??*
 
 %{__mkdir_p} %{buildroot}%{pear_xmldir}
-%{__install} -pm 644 Net_Socket.xml %{buildroot}%{pear_xmldir}
+%{__install} -pm 644 %{pear_name}.xml %{buildroot}%{pear_xmldir}
+
 
 %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_Socket.xml >/dev/null || :
+%{__pear} install --nodeps --soft --force --register-only \
+    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :
 
 %postun
-if [ "$1" -eq "0" ]; then
-    %{__pear} uninstall --nodeps --ignore-errors --register-only Net_Socket >/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
+%doc LICENSE CHANGELOG
 %{pear_phpdir}/Net
 %{pear_xmldir}/Net_Socket.xml
 
+
 %changelog
+* Sat Mar 31 2007 Remi Collet <Fedora at FamilleCollet.com> 1.0.7-1
+- remove PEAR from sumnary
+- update to 1.0.7
+- spec cleanup
+- add generated CHANGELOG
+
 * Fri Sep 08 2006 Remi Collet <Fedora at FamilleCollet.com> 1.0.6-5
 - last template.spec
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-Socket/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Sep 2006 16:23:08 -0000	1.2
+++ sources	31 Mar 2007 06:22:27 -0000	1.3
@@ -1 +1 @@
-f961deffb093a58eb4c48478de1b27ed  Net_Socket-1.0.6.tgz
+41881862be49f8fd716613dcd67fdcd3  Net_Socket-1.0.7.tgz




More information about the fedora-extras-commits mailing list