rpms/php-channel-doctrine/F-13 channel.xml, 1.1, 1.2 php-channel-doctrine.spec, 1.2, 1.3

[Christof Damian]

Author: cdamian

Update of /cvs/pkgs/rpms/php-channel-doctrine/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv9181

Modified Files:
	channel.xml php-channel-doctrine.spec 
Log Message:
use fixed channel.xml and spec file from devel


Index: channel.xml
===================================================================
RCS file: /cvs/pkgs/rpms/php-channel-doctrine/F-13/channel.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- channel.xml	20 Aug 2009 18:45:27 -0000	1.1
+++ channel.xml	19 May 2010 17:49:55 -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.phpdoctrine.org</name>
- <summary>Channel for installing and upgrading Doctrine through pear.</summary>
- <suggestedalias>pear.phpdoctrine.org</suggestedalias>
- <servers>
-  <primary>
-   <rest>
-    <baseurl type="REST1.0">http://pear.phpdoctrine.org/Chiara_PEAR_Server_REST/</baseurl>
-    <baseurl type="REST1.1">http://pear.phpdoctrine.org/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.doctrine-project.org</name>
+  <summary>Doctrine PEAR channel</summary>
+  <suggestedalias>doctrine</suggestedalias>
+  <servers>
+    <primary>
+      <rest>
+        <baseurl type="REST1.0">http://pear.doctrine-project.org/rest/</baseurl>
+        <baseurl type="REST1.1">http://pear.doctrine-project.org/rest/</baseurl>
+        <baseurl type="REST1.2">http://pear.doctrine-project.org/rest/</baseurl>
+        <baseurl type="REST1.3">http://pear.doctrine-project.org/rest/</baseurl>
+      </rest>
+    </primary>
+  </servers>
 </channel>
\ No newline at end of file


Index: php-channel-doctrine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-channel-doctrine/F-13/php-channel-doctrine.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- php-channel-doctrine.spec	13 May 2010 17:26:53 -0000	1.2
+++ php-channel-doctrine.spec	19 May 2010 17:49:55 -0000	1.3
@@ -4,7 +4,7 @@
 
 Name:		php-channel-doctrine
 Version:	1.3
-Release:	1%{?dist}
+Release:	1%{?dist}.1
 Summary:	Adds doctrine project channel to PEAR
 
 Group:		Development/Languages
@@ -39,7 +39,7 @@ PEAR packages from this channel to be in
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 %{__mkdir_p} $RPM_BUILD_ROOT%{pear_xmldir}
-%{__install} -pm 644 %{SOURCE0} $RPM_BUILD_ROOT%{pear_xmldir}/%{channel}.xml
+%{__install} -pm 644 %{SOURCE0} $RPM_BUILD_ROOT%{pear_xmldir}/%{name}.xml
 
 
 %clean
@@ -65,10 +65,13 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%{pear_xmldir}/*
+%{pear_xmldir}/%{name}.xml
 
 
 %changelog
+* Mon Apr  5 2010 Remi Collet <fedora at famillecollet.com> - 1.3-1.1
+- fix xml filename
+
 * Fri Apr  2 2010 Christof Damian <christof at damian.net> - 1.3-1
 - new url and channel file
 - changed version to use rest version