summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-04-15 09:48:03 +0200
committerRemi Collet <fedora@famillecollet.com>2014-04-15 09:48:03 +0200
commit44cae4a46533639482841c317925956fe31d223d (patch)
tree931604befb9baedea77f016b5135f76e8ce0752a
parente40283424a8e6b6b96a8844bff4e87f4d6dedd76 (diff)
php-horde-imp: cleanups
-rw-r--r--php-horde-imp.spec29
1 files changed, 16 insertions, 13 deletions
diff --git a/php-horde-imp.spec b/php-horde-imp.spec
index 89d52f9..8e3d8b6 100644
--- a/php-horde-imp.spec
+++ b/php-horde-imp.spec
@@ -24,7 +24,7 @@ Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: gettext
-BuildRequires: php-common >= 5.3.0
+BuildRequires: php(language) >= 5.3.0
BuildRequires: php-pear(PEAR) >= 1.7.0
BuildRequires: php-channel(%{pear_channel})
BuildRequires: php-pear(%{pear_channel}/Horde_Role) >= 1.0.0
@@ -36,20 +36,15 @@ BuildRequires: php-pear(%{pear_channel}/Horde_Itip) >= 2.0.0
Requires(post): %{__pear}
Requires(postun): %{__pear}
-Requires: php-common >= 5.3.0
-# extensions required from package.xml
+# Web stuff
+Requires: mod_php
+Requires: httpd
+# From package.xml required
+Requires: php(language) >= 5.3.0
Requires: php-dom
Requires: php-gettext
Requires: php-hash
Requires: php-json
-# extensions required from phpci analysis
-Requires: php-date
-Requires: php-ereg
-Requires: php-filter
-Requires: php-openssl
-Requires: php-pcre
-Requires: php-posix
-Requires: php-spl
Requires: php-pear(PEAR) >= 1.7.0
Requires: php-channel(%{pear_channel})
Requires: php-pear(%{pear_channel}/Horde_Role) >= 1.0.0
@@ -125,10 +120,18 @@ Requires: php-pear(%{pear_channel}/Horde_Vfs) >= 2.0.0
Requires: php-pear(%{pear_channel}/Horde_Vfs) < 3.0.0
Requires: php-pear(%{pear_channel}/Horde_View) >= 2.0.0
Requires: php-pear(%{pear_channel}/Horde_View) < 3.0.0
-# Optional
+# From package.xml, optional
Requires: php-pear(%{pear_channel}/Horde_Text_Filter_Csstidy) >= 2.0.0
# Optional and implicitly required:
# Horde_Vfs, Horde_History, Horde_Http, Horde_Stream_Filter
+# From phpcompatinfo report for version 6.1.7
+Requires: php-date
+Requires: php-ereg
+Requires: php-filter
+Requires: php-openssl
+Requires: php-pcre
+Requires: php-posix
+Requires: php-spl
Provides: php-pear(%{pear_channel}/%{pear_name}) = %{version}
Obsoletes: imp < 5
@@ -292,4 +295,4 @@ fi
- Update to 6.0.4
* Sat Jan 12 2013 Remi Collet <remi@fedoraproject.org> - 6.0.3-1
-- Initial package
+- Initial package \ No newline at end of file