use fixed name for web subpackage

diff --git a/php-xcache.spec b/php-xcache.spec
index 141e86ac61f0717b034c32100ceaa713f0f9f3af..b4d30ef861cb7aae1c7785754c3f7a671d353844 100644 (file)
--- a/php-xcache.spec
+++ b/php-xcache.spec
@@ -47,18 +47,19 @@ now running on production servers under high load.
 XCache to szybkie, stabilne buforowanie opcodów PHP, przetestowane i
 działające na produkcyjnych serwerach o dużym obciążeniu.
 
-%package web
+%package -n php-xcache-web
 Summary:       WEB interface for xCache
 Group:         Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      webapps
 Requires:      webserver(access)
 Requires:      webserver(php) >= 5.0
+Obsoletes:     php55-xcache-web < 3.1.0-5
 %if "%{_rpmversion}" >= "5"
 BuildArch:     noarch
 %endif
 
-%description web
+%description -n php-xcache-web
 Via this web interface script you can manage and view statistics of
 xCache.
 
@@ -135,22 +136,22 @@ fi
 %triggerpostun -- %{name} < 3.0.0-0.8
 %{__sed} -i -e 's,zend_extension,extension,' %{php_sysconfdir}/conf.d/%{modname}.ini
 
-%triggerin web -- apache1 < 1.3.37-3, apache1-base
+%triggerin -n php-xcache-web -- apache1 < 1.3.37-3, apache1-base
 %webapp_register apache %{_webapp}
 
-%triggerun web -- apache1 < 1.3.37-3, apache1-base
+%triggerun -n php-xcache-web -- apache1 < 1.3.37-3, apache1-base
 %webapp_unregister apache %{_webapp}
 
-%triggerin web -- apache < 2.2.0, apache-base
+%triggerin -n php-xcache-web -- apache < 2.2.0, apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun web -- apache < 2.2.0, apache-base
+%triggerun -n php-xcache-web -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
-%triggerin web -- lighttpd
+%triggerin -n php-xcache-web -- lighttpd
 %webapp_register lighttpd %{_webapp}
 
-%triggerun web -- lighttpd
+%triggerun -n php-xcache-web -- lighttpd
 %webapp_unregister lighttpd %{_webapp}
 
 %files
@@ -163,7 +164,7 @@ fi
 %dir %attr(775,root,http) /var/cache/php-xcache
 
 %if %{with web}
-%files web
+%files -n php-xcache-web
 %defattr(644,root,root,755)
 %doc config*.example.php
 %dir %attr(750,root,http) %{_sysconfdir}