[packaging] Branch 'el5/feature-kolab-2.3' - 2 commits - php-pear-Horde-XML_Element.spec

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Thu Jan 13 16:48:24 CET 2011


 php-pear-Horde-XML_Element.spec |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

New commits:
commit e80a6d8f94351791974ca98fff9bba504ed5f145
Author: Jeroen van Meeuwen (Ergo Project) <jeroen.van.meeuwen at ergo-project.org>
Date:   Thu Jan 13 15:48:11 2011 +0000

    Correct %setup

diff --git a/php-pear-Horde-XML_Element.spec b/php-pear-Horde-XML_Element.spec
index c88a733..fde689b 100644
--- a/php-pear-Horde-XML_Element.spec
+++ b/php-pear-Horde-XML_Element.spec
@@ -28,7 +28,7 @@ Provides:           php-pear(%{pear_name}) = %{version}
 This package provides the Horde XML_Element
 
 %prep
-%setup -q -n Horde_%{pear_name}-%{version}%{?_snapshot}
+%setup -q -n %{pear_name}-%{version}%{?_snapshot}
 
 %build
 %__mv ../package*.xml .


commit fc93c557fe64f70ba15194e06d2e76ad8432b432
Author: Jeroen van Meeuwen (Ergo Project) <jeroen.van.meeuwen at ergo-project.org>
Date:   Thu Jan 13 15:47:34 2011 +0000

    Correct provides and pear_name

diff --git a/php-pear-Horde-XML_Element.spec b/php-pear-Horde-XML_Element.spec
index 800b6af..c88a733 100644
--- a/php-pear-Horde-XML_Element.spec
+++ b/php-pear-Horde-XML_Element.spec
@@ -1,16 +1,16 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%global pear_name Xml_Element
+%global pear_name Horde_Xml_Element
 
 %global _snapshot dev20101122
 
 Name:               php-pear-Horde-XML_Element
 Version:            0.1.0
-Release:            0.1%{?_snapshot}%{?dist}
+Release:            0.2%{?_snapshot}%{?dist}
 Summary:            Horde XML_Element
 License:            LGPL
 Group:              Productivity/Networking/Web/Servers
 Url:                http://pear.horde.org/index.php?package=%{pear_name}
-Source0:            http://files.kolab.org/incoming/wrobel/Horde_%{pear_name}-%{version}%{?_snapshot}.tgz
+Source0:            http://files.kolab.org/incoming/wrobel/%{pear_name}-%{version}%{?_snapshot}.tgz
 BuildArch:          noarch
 BuildRoot:          %{_tmppath}/%{name}-%{version}-build
 Requires(post):     %{_bindir}/pear
@@ -22,7 +22,7 @@ Requires:           php-channel(pear.horde.org)
 BuildRequires:      php-pear(Horde_Framework)
 BuildRequires:      php-pear
 BuildRequires:      php-channel(pear.horde.org)
-Provides:           php-pear(Horde_XML_Element)
+Provides:           php-pear(%{pear_name}) = %{version}
 
 %description
 This package provides the Horde XML_Element
@@ -63,6 +63,8 @@ fi
 %dir %{pear_phpdir}/Horde/Xml/
 %{pear_phpdir}/Horde/Xml/Element/
 %{pear_phpdir}/Horde/Xml/Element.php
+
 %changelog
-* Wed Jan 12 2011 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 0.1.0-1
-- New package
+* Thu Jan 13 2011 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 0.1.0-0.2dev20101122
+- Correct provides
+- New package (0.1)




More information about the packaging-commits mailing list