summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2013-02-06 15:11:12 +0100
committerRemi Collet <fedora@famillecollet.com>2013-02-06 15:11:12 +0100
commit17345afbda78b7d8973f1d04575480ace9a567c7 (patch)
tree2c80a730cb319f83a57867518ba348612452c1ad
parent7080653503d51d7870e9e3b1546a75184fb01b6b (diff)
php-horde-Horde-Xml-Element: cleanups for review
-rw-r--r--php-horde-Horde-Xml-Element.spec30
1 files changed, 20 insertions, 10 deletions
diff --git a/php-horde-Horde-Xml-Element.spec b/php-horde-Horde-Xml-Element.spec
index de304d7..7d90f96 100644
--- a/php-horde-Horde-Xml-Element.spec
+++ b/php-horde-Horde-Xml-Element.spec
@@ -5,24 +5,26 @@
Name: php-horde-Horde-Xml-Element
Version: 2.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Horde Xml Element object
Group: Development/Libraries
License: BSD
-URL: http://pear.horde.org
+URL: http://%{pear_channel}
Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildArch: noarch
-BuildRequires: php-pear
+BuildRequires: php-common >= 5.3.0
+BuildRequires: php-pear(PEAR) >= 1.7.0
BuildRequires: php-channel(%{pear_channel})
# To run unit tests
BuildRequires: php-pear(%{pear_channel}/Horde_Test) >= 2.1.0
Requires(post): %{__pear}
Requires(postun): %{__pear}
-Requires: php(language) >= 5.3.0
+Requires: php-common >= 5.3.0
+Requires: php-pear(PEAR) >= 1.7.0
Requires: php-dom
Requires: php-channel(%{pear_channel})
Requires: php-pear(%{pear_channel}/Horde_Exception) >= 2.0.0
@@ -39,8 +41,7 @@ single call, without introducing "ghost" objects.
%prep
-%setup -q -c -T
-tar xif %{SOURCE0}
+%setup -q -c
cd %{pear_name}-%{version}
cp ../package.xml %{name}.xml
@@ -52,6 +53,7 @@ cd %{pear_name}-%{version}
%install
+rm -rf %{buildroot}
cd %{pear_name}-%{version}
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
@@ -71,6 +73,10 @@ phpunit\
.
+%clean
+rm -rf %{buildroot}
+
+
%post
%{__pear} install --nodeps --soft --force --register-only \
%{pear_xmldir}/%{name}.xml >/dev/null || :
@@ -86,17 +92,21 @@ fi
%defattr(-,root,root,-)
%doc %{pear_docdir}/%{pear_name}
%{pear_xmldir}/%{name}.xml
+%dir %{pear_phpdir}/Horde/Xml
%{pear_phpdir}/Horde/Xml/Element
%{pear_phpdir}/Horde/Xml/Element.php
%{pear_testdir}/%{pear_name}
%changelog
-* Mon Nov 19 2012 Remi Collet <RPMS@FamilleCollet.com> - 2.0.1-1
-- Update to 2.0.1 for remi repo
+* Wed Feb 6 2013 Remi Collet <remi@fedoraproject.org> - 2.0.1-2
+- cleanups for review
+
+* Mon Nov 19 2012 Remi Collet <remi@fedoraproject.org> - 2.0.1-1
+- Update to 2.0.1
-* Fri Nov 2 2012 Remi Collet <RPMS@FamilleCollet.com> - 2.0.0-1
-- Update to 2.0.0 for remi repo
+* Fri Nov 2 2012 Remi Collet <remi@fedoraproject.org> - 2.0.0-1
+- Update to 2.0.0
* Sat Jan 28 2012 Nick Bebout <nb@fedoraproject.org> - 1.0.1-1
- Initial package