kolab/issue3315 (PEAR-Horde-Channel-1.0 fails to compile on solaris 10)

6 files changed, 48 insertions, 4 deletions

diff --git a/pear/PEAR-Horde-Channel/ChangeLog b/pear/PEAR-Horde-Channel/ChangeLog
index 05d572d..0d6bd6c 100644
--- a/pear/PEAR-Horde-Channel/ChangeLog
+++ b/pear/PEAR-Horde-Channel/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-07  Gunnar Wrobel  <p@rdus.de>
+
+	* PEAR-Horde-Channel.spec:
+	kolab/issue3315 (PEAR-Horde-Channel-1.0 fails to compile on
+	solaris 10)
+
 2008-12-18  Gunnar Wrobel  <p@rdus.de>
 
 	* PEAR-Horde-Channel.spec: kolab/issue3315 (PEAR-Horde-Channel-1.0
diff --git a/pear/PEAR-Horde-Channel/PEAR-Horde-Channel.spec b/pear/PEAR-Horde-Channel/PEAR-Horde-Channel.spec
index 05b78b3..8cd817d 100644
--- a/pear/PEAR-Horde-Channel/PEAR-Horde-Channel.spec
+++ b/pear/PEAR-Horde-Channel/PEAR-Horde-Channel.spec
@@ -8,7 +8,7 @@ Summary:        Adds pear.horde.org channel to PEAR
 Group:          Development/Languages
 License:        N/A
 URL:            http://pear.horde.org/
-Source0:        http://pear.horde.org/channel.xml
+Source0:        pear.horde.org.xml
 
 # Build Info
 Prefix:		%{l_prefix}
@@ -32,7 +32,7 @@ from this channel to be installed.
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
-install -m 644 %{SOURCE0} $RPM_BUILD_ROOT%{pear_xmldir}/pear.horde.org.xml
+install -m 644 %{SOURCE0} $RPM_BUILD_ROOT%{pear_xmldir}
 %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} 
 
 %clean
diff --git a/pear/PEAR-Horde-Channel/pear.horde.org.xml b/pear/PEAR-Horde-Channel/pear.horde.org.xml
new file mode 100644
index 0000000..035685a
--- /dev/null
+++ b/pear/PEAR-Horde-Channel/pear.horde.org.xml
@@ -0,0 +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.horde.org</name>
+ <summary>Horde PEAR Channel</summary>
+ <suggestedalias>horde</suggestedalias>
+ <servers>
+  <primary>
+   <rest>
+    <baseurl type="REST1.0">http://pear.horde.org/Chiara_PEAR_Server_REST/</baseurl>
+    <baseurl type="REST1.1">http://pear.horde.org/Chiara_PEAR_Server_REST/</baseurl>
+   </rest>
+  </primary>
+ </servers>
+</channel>
\ No newline at end of file
diff --git a/pear/PEAR-PHPUnit-Channel/ChangeLog b/pear/PEAR-PHPUnit-Channel/ChangeLog
index 4d04d8c..16dab49 100644
--- a/pear/PEAR-PHPUnit-Channel/ChangeLog
+++ b/pear/PEAR-PHPUnit-Channel/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-07  Gunnar Wrobel  <p@rdus.de>
+
+	* PEAR-PHPUnit-Channel.spec:
+	kolab/issue3315 (PEAR-Horde-Channel-1.0 fails to compile on
+	solaris 10)
+
 2008-12-18  Gunnar Wrobel  <p@rdus.de>
 
 	* PEAR-PHPUnit-Channel.spec:
diff --git a/pear/PEAR-PHPUnit-Channel/PEAR-PHPUnit-Channel.spec b/pear/PEAR-PHPUnit-Channel/PEAR-PHPUnit-Channel.spec
index b8d9d8f..e222796 100644
--- a/pear/PEAR-PHPUnit-Channel/PEAR-PHPUnit-Channel.spec
+++ b/pear/PEAR-PHPUnit-Channel/PEAR-PHPUnit-Channel.spec
@@ -8,7 +8,7 @@ Summary:        Adds pear.phpunit.de channel to PEAR
 Group:          Development/Languages
 License:        N/A
 URL:            http://pear.phpunit.de/
-Source0:        http://pear.phpunit.de/channel.xml
+Source0:        pear.phpunit.de.xml
 
 # Build Info
 Prefix:		%{l_prefix}
@@ -30,7 +30,7 @@ from this channel to be installed.
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
-install -m 644 %{SOURCE0} $RPM_BUILD_ROOT%{pear_xmldir}/pear.phpunit.de.xml
+install -m 644 %{SOURCE0} $RPM_BUILD_ROOT%{pear_xmldir}
 %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} 
 
 %clean
diff --git a/pear/PEAR-PHPUnit-Channel/pear.phpunit.de.xml b/pear/PEAR-PHPUnit-Channel/pear.phpunit.de.xml
new file mode 100644
index 0000000..4ec6073
--- /dev/null
+++ b/pear/PEAR-PHPUnit-Channel/pear.phpunit.de.xml
@@ -0,0 +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>
+</channel>
\ No newline at end of file