summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2013-02-06 14:54:04 +0100
committerRemi Collet <fedora@famillecollet.com>2013-02-06 14:54:04 +0100
commit6b8d79cc78773ef2a43c124a5adeeb8c8899dd11 (patch)
tree4122294c5d978bdc11eefb3e70828a82c7ad34a6
parent8078d3a6041cab0db326c7641be8db28cdebf5f3 (diff)
php-horde-Horde-Xml-Wbxml: cleanups
-rw-r--r--php-horde-Horde-Xml-Wbxml.spec29
1 files changed, 20 insertions, 9 deletions
diff --git a/php-horde-Horde-Xml-Wbxml.spec b/php-horde-Horde-Xml-Wbxml.spec
index 4478e90..d21acee 100644
--- a/php-horde-Horde-Xml-Wbxml.spec
+++ b/php-horde-Horde-Xml-Wbxml.spec
@@ -5,17 +5,18 @@
Name: php-horde-Horde-Xml-Wbxml
Version: 2.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Provides an API for encoding and decoding WBXML documents
Group: Development/Libraries
-License: LGPLv2+
-URL: http://pear.horde.org
+License: LGPLv2
+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
@@ -25,7 +26,8 @@ BuildRequires: libwbxml
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-channel(%{pear_channel})
Requires: php-pear(%{pear_channel}/Horde_Util) >= 2.0.0
Conflicts: php-pear(%{pear_channel}/Horde_Util) >= 3.0.0
@@ -52,6 +54,7 @@ cd %{pear_name}-%{version}
%install
+rm -rf %{buildroot}
cd %{pear_name}-%{version}
PHPRC=../php.ini %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
@@ -71,6 +74,10 @@ phpunit\
.
+%clean
+rm -rf %{buildroot}
+
+
%post
%{__pear} install --nodeps --soft --force --register-only \
%{pear_xmldir}/%{name}.xml >/dev/null || :
@@ -86,17 +93,21 @@ fi
%defattr(-,root,root,-)
%doc %{pear_docdir}/%{pear_name}
%{pear_xmldir}/%{name}.xml
+%dir %{pear_phpdir}/Horde/Xml
%{pear_phpdir}/Horde/Xml/Wbxml
%{pear_phpdir}/Horde/Xml/Wbxml.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
-* Thu Nov 1 2012 Remi Collet <RPMS@FamilleCollet.com> - 2.0.0-1
-- Update to 2.0.0 for remi repo
+* Thu Nov 1 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.3-1
- Initial package