X-Git-Url: https://git.pld-linux.org/?p=packages%2Fphp-xcache.git;a=blobdiff_plain;f=php-xcache.spec;h=08054890e76eab195a39079f7588648fc92c60bc;hp=141e86ac61f0717b034c32100ceaa713f0f9f3af;hb=HEAD;hpb=57e8e7f8b731b1aa5ed8986cbd4e8e016730161c

diff --git a/php-xcache.spec b/php-xcache.spec
index 141e86a..0805489 100644
--- a/php-xcache.spec
+++ b/php-xcache.spec
@@ -4,7 +4,7 @@
 # Conditional build:
 %bcond_without	web		# make web package
 
-# don't build for php53
+# build "web" only for 5.5 version
 %if 0%{?_pld_builder:1} && "%{?php_suffix}" != "55"
 %undefine	with_web
 %endif
@@ -14,12 +14,15 @@
 Summary:	%{modname} - PHP opcode cacher
 Summary(pl.UTF-8):	%{modname} - buforowanie opcodów PHP
 Name:		%{php_name}-%{modname}
-Version:	3.1.0
-Release:	5
+# 3.2.0 leaks fds, use xcache-3.1 branch for now
+# http://xcache.lighttpd.net/ticket/363
+Blocker
+Version:	3.2.0
+Release:	0.1
 License:	BSD
 Group:		Development/Languages/PHP
 Source0:	http://xcache.lighttpd.net/pub/Releases/%{version}/xcache-%{version}.tar.bz2
-# Source0-md5:	e5816d47d52be200b959bf69a673ff74
+# Source0-md5:	3655bd20483dc23d24f87f9dc924a62e
 Source1:	%{modname}-apache.conf
 Source2:	%{modname}-lighttpd.conf
 Patch0:		config.patch
@@ -31,6 +34,7 @@ BuildRequires:	sed >= 4.0
 %{?requires_zend_extension}
 Requires:	php(core) >= 5.0.4
 Requires(triggerpostun):	sed >= 4.0
+Provides:	php(xcache) = %{version}
 Obsoletes:	php-xcache < 3.1.0-3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -47,18 +51,17 @@ 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
-%if "%{_rpmversion}" >= "5"
+Obsoletes:	php55-xcache-web < 3.1.0-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 +138,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 +166,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}