rpms/php-channel-phpunit/F-12 channel.xml, 1.1, 1.2 php-channel-phpunit.spec, 1.4, 1.5

[Remi Collet]

Author: remi

Update of /cvs/pkgs/rpms/php-channel-phpunit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28416

Modified Files:
	channel.xml php-channel-phpunit.spec 
Log Message:
update to new channel.xml for URL, fix #542417


Index: channel.xml
===================================================================
RCS file: /cvs/pkgs/rpms/php-channel-phpunit/F-12/channel.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- channel.xml	29 Dec 2006 17:38:13 -0000	1.1
+++ channel.xml	18 Dec 2009 18:58:22 -0000	1.2
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<channel version="1.0" xmlns="http://pear.php.net/channel-1.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://pear.php.net/dtd/channel-1.0 http://pear.php.net/dtd/channel-1.0.xsd">
- <name>pear.phpunit.de</name>
- <summary>PHPUnit channel server</summary>
- <suggestedalias>phpunit</suggestedalias>
- <servers>
-  <primary>
-   <rest>
-    <baseurl type="REST1.0">http://pear.phpunit.de/Chiara_PEAR_Server_REST/</baseurl>
-    <baseurl type="REST1.1">http://pear.phpunit.de/Chiara_PEAR_Server_REST/</baseurl>
-   </rest>
-  </primary>
- </servers>
+<?xml version="1.0" encoding="UTF-8" ?>
+<channel version="1.0" xmlns="http://pear.php.net/channel-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/channel-1.0 http://pear.php.net/dtd/channel-1.0.xsd">
+  <name>pear.phpunit.de</name>
+  <summary>PHPUnit PEAR Channel</summary>
+  <suggestedalias>phpunit</suggestedalias>
+  <servers>
+    <primary>
+      <rest>
+        <baseurl type="REST1.0">http://pear.phpunit.de/rest/</baseurl>
+        <baseurl type="REST1.1">http://pear.phpunit.de/rest/</baseurl>
+        <baseurl type="REST1.2">http://pear.phpunit.de/rest/</baseurl>
+        <baseurl type="REST1.3">http://pear.phpunit.de/rest/</baseurl>
+      </rest>
+    </primary>
+  </servers>
 </channel>
\ No newline at end of file


Index: php-channel-phpunit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-channel-phpunit/F-12/php-channel-phpunit.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- php-channel-phpunit.spec	26 Jul 2009 17:59:26 -0000	1.4
+++ php-channel-phpunit.spec	18 Dec 2009 18:58:22 -0000	1.5
@@ -1,8 +1,9 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 
 Name:           php-channel-phpunit
-Version:        1.0
-Release:        4%{?dist}
+# Use REST version
+Version:        1.3
+Release:        1%{?dist}
 Summary:        Adds phpunit channel to PEAR
 
 Group:          Development/Languages
@@ -32,7 +33,7 @@ from this channel to be installed.
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 %{SOURCE0} $RPM_BUILD_ROOT%{pear_xmldir}/pear.phpunit.de.xml
+install -pm 644 %{SOURCE0} $RPM_BUILD_ROOT%{pear_xmldir}/%{name}.xml
 
 
 %clean
@@ -41,9 +42,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 if [ $1 -eq  1 ] ; then
-   %{__pear} channel-add %{pear_xmldir}/pear.phpunit.de.xml > /dev/null || :
+   %{__pear} channel-add %{pear_xmldir}/%{name}.xml > /dev/null || :
 else
-   %{__pear} channel-update %{pear_xmldir}/pear.phpunit.de.xml > /dev/null ||:
+   %{__pear} channel-update %{pear_xmldir}/%{name}.xml > /dev/null ||:
 fi
 
 
@@ -55,10 +56,14 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%{pear_xmldir}/*
+%{pear_xmldir}/%{name}.xml
 
 
 %changelog
+* Fri Dec 18 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.3-1
+- update for REST 1.3 and new URL (#542417)
+- rename pear.phpunit.de.xml to php-channel-phpunit.xml
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild