web is noarch package

[packages/php-xcache.git] / php-xcache.spec

diff --git a/php-xcache.spec b/php-xcache.spec
index 51860f125c73d640ebff5e6318fde7d4609ea56a..f8d8583473b73a3654a762d515fd4be900c9baa3 100644 (file)
--- a/php-xcache.spec
+++ b/php-xcache.spec
@@ -6,14 +6,13 @@ Summary:      %{modname} - PHP opcode cacher
 Summary(pl.UTF-8):     %{modname} - buforowanie opcodów PHP
 Name:          %{php_name}-%{modname}
 Version:       3.0.1
-Release:       2
+Release:       3
 License:       BSD
 Group:         Development/Languages/PHP
 Source0:       http://xcache.lighttpd.net/pub/Releases/%{version}/xcache-%{version}.tar.bz2
 # Source0-md5: 45086010bc4f82f506c08be1c556941b
 Source1:       %{modname}-apache.conf
 Source2:       %{modname}-lighttpd.conf
-Source3:       %{modname}-httpd.conf
 Patch0:                config.patch
 URL:           http://xcache.lighttpd.net/
 BuildRequires: %{php_name}-devel >= 4:5.2.17-8
@@ -42,8 +41,11 @@ Summary:     WEB interface for xCache
 Group:         Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      webapps
+Requires:      webserver(access)
 Requires:      webserver(php) >= 5.0
-Conflicts:     apache-base < 2.4.0-1
+%if "%{_rpmversion}" >= "5"
+BuildArch:     noarch
+%endif
 
 %description web
 Via this web interface script you can manage and view statistics of
@@ -103,7 +105,7 @@ ln -s %{_sysconfdir}/config.php $RPM_BUILD_ROOT%{_appdir}/config.php
 ln -s %{_sysconfdir}/cacher.config.php $RPM_BUILD_ROOT%{_appdir}/cacher/config.php
 ln -s %{_sysconfdir}/coverager.config.php $RPM_BUILD_ROOT%{_appdir}/coverager/config.php
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
 
 %clean
@@ -126,10 +128,10 @@ fi
 %triggerun web -- apache1 < 1.3.37-3, apache1-base
 %webapp_unregister apache %{_webapp}
 
-%triggerin web -- apache-base
+%triggerin web -- apache < 2.2.0, apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun web -- apache-base
+%triggerun web -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerin web -- lighttpd