rpms/php-channel-doctrine/devel channel.xml, 1.1, 1.2 php-channel-doctrine.spec, 1.1, 1.2

[Christof Damian]

Author: cdamian

Update of /cvs/pkgs/rpms/php-channel-doctrine/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv4413

Modified Files:
	channel.xml php-channel-doctrine.spec 
Log Message:
new url & channel file, changed version to use rest version


Index: channel.xml
===================================================================
RCS file: /cvs/pkgs/rpms/php-channel-doctrine/devel/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	4 Apr 2010 16:02:31 -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/devel/php-channel-doctrine.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- php-channel-doctrine.spec	20 Aug 2009 18:45:27 -0000	1.1
+++ php-channel-doctrine.spec	4 Apr 2010 16:02:31 -0000	1.2
@@ -1,14 +1,16 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 
+%global channel pear.doctrine-project.org
+
 Name:		php-channel-doctrine
-Version:	1.0.0
-Release:	2%{?dist}
+Version:	1.3
+Release:	1%{?dist}
 Summary:	Adds doctrine project channel to PEAR
 
 Group:		Development/Languages
 License:	LGPLv2+
-URL:		http://www.doctrine-project.com/
-Source0:	http://pear.doctrine-project.com/channel.xml
+URL:		http://www.doctrine-project.org/
+Source0:	http://pear.doctrine-project.org/channel.xml
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -19,7 +21,7 @@ Requires:	php-pear(PEAR)
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 
-Provides:	php-channel(pear.doctrine-project.com)
+Provides:	php-channel(%{channel})
 
 %description
 This package adds the doctrine channel which allows
@@ -37,23 +39,27 @@ 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}/pear.doctrine-project.com.xml
+%{__install} -pm 644 %{SOURCE0} $RPM_BUILD_ROOT%{pear_xmldir}/%{channel}.xml
 
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
 %post
-if [ $1 -eq  1 ] ; then
-	%{__pear} channel-add %{pear_xmldir}/pear.doctrine-project.com.xml > /dev/null || :
-else
-	%{__pear} channel-update %{pear_xmldir}/pear.doctrine-project.com.xml > /dev/null ||:
-fi
+# always add (handle update from old pear.phpdoctrine.org)
+%{__pear} channel-add %{pear_xmldir}/%{name}.xml > /dev/null || :
 
+if [ $1 -gt  1 ] ; then
+	%{__pear} channel-update %{pear_xmldir}/%{name}.xml > /dev/null ||:
+
+	 # will fail in most case (if installed packages)
+	%{__pear} channel-delete pear.phpdoctrine.org > /dev/null || :
+fi
 
 %postun
+%{__pear} channel-delete pear.phpdoctrine.org > /dev/null || :
 if [ $1 -eq 0 ] ; then
-	%{__pear} channel-delete pear.doctrine-project.com > /dev/null || :
+	%{__pear} channel-delete %{channel} > /dev/null || :
 fi
 
 
@@ -63,6 +69,10 @@ fi
 
 
 %changelog
+* Fri Apr  2 2010 Christof Damian <christof at damian.net> - 1.3-1
+- new url and channel file
+- changed version to use rest version
+
 * Thu Aug 20 2009 Christof Damian <christof at damian.net> - 1.0.0-2
 - changed license to LGPLv2+