[php-channel-swift] refresh channel.xml, #981539

[Remi Collet]

commit 59fe92dfa3616714b626cbd77fcc9da579d72590
Author: Remi Collet <remi at fedoraproject.org>
Date:   Fri Jul 5 07:52:53 2013 +0200

    refresh channel.xml, #981539

 channel.xml            |   26 +++++++++++++-------------
 php-channel-swift.spec |   18 +++++++++++-------
 2 files changed, 24 insertions(+), 20 deletions(-)
---
diff --git a/channel.xml b/channel.xml
index de6cd81..3fe57cd 100644
--- a/channel.xml
+++ b/channel.xml
@@ -1,16 +1,16 @@
 <?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.swiftmailer.org</name>
-  <summary>Swift Mailer PEAR channel</summary>
-  <suggestedalias>swift</suggestedalias>
-  <servers>
-    <primary>
-      <rest>
-        <baseurl type="REST1.0">http://pear.swiftmailer.org//rest/</baseurl>
-        <baseurl type="REST1.1">http://pear.swiftmailer.org//rest/</baseurl>
-        <baseurl type="REST1.2">http://pear.swiftmailer.org//rest/</baseurl>
-        <baseurl type="REST1.3">http://pear.swiftmailer.org//rest/</baseurl>
-      </rest>
-    </primary>
-  </servers>
+    <name>pear.swiftmailer.org</name>
+    <summary>Swift Mailer PEAR channel</summary>
+    <suggestedalias>swift</suggestedalias>
+    <servers>
+        <primary>
+            <rest>
+                <baseurl type="REST1.0">http://pear.swiftmailer.org/rest/</baseurl>
+                <baseurl type="REST1.1">http://pear.swiftmailer.org/rest/</baseurl>
+                <baseurl type="REST1.2">http://pear.swiftmailer.org/rest/</baseurl>
+                <baseurl type="REST1.3">http://pear.swiftmailer.org/rest/</baseurl>
+            </rest>
+        </primary>
+    </servers>
 </channel>
\ No newline at end of file
diff --git a/php-channel-swift.spec b/php-channel-swift.spec
index a2e94f7..b5c45ff 100644
--- a/php-channel-swift.spec
+++ b/php-channel-swift.spec
@@ -2,19 +2,19 @@
 
 Name:		php-channel-swift
 Version:	1.3
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Adds swift mailer project channel to PEAR
 
 Group:		Development/Languages
 License:	LGPLv3
 URL:		http://www.swiftmailer.org/
 Source0:	http://pear.swiftmailer.org/channel.xml
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
-BuildRequires:	php-pear >= 1:1.4.9-1.2
-Requires:	php-pear(PEAR)
+BuildRequires:	php-pear
 
+Requires:	php-pear(PEAR)
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 
@@ -34,14 +34,15 @@ PEAR packages 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}/%{name}.xml
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
+install -pm 644 %{SOURCE0} $RPM_BUILD_ROOT%{pear_xmldir}/%{name}.xml
 
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
+
 %post
 if [ $1 -eq  1 ] ; then
 	%{__pear} channel-add %{pear_xmldir}/%{name}.xml > /dev/null || :
@@ -62,6 +63,9 @@ fi
 
 
 %changelog
+* Fri Jul  5 2013 Remi Collet <remi at fedoraproject.org> - 1.3-7
+- refresh channel.xml, #981539
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild