- -web subpackage

Changed files:
    php-xcache.spec -> 1.19

diff --git a/php-xcache.spec b/php-xcache.spec
index ead09060ebb817253ee7e558ff47f830fd3511b5..dc79387020b0d6c4445e365dd4e5ea011965c99e 100644 (file)
--- a/php-xcache.spec
+++ b/php-xcache.spec
@@ -1,16 +1,16 @@
-%define                _modname        xcache
-Summary:       %{_modname} - PHP opcode cacher
-Summary(pl.UTF-8):     %{_modname} - buforowanie opcodów PHP
-Name:          php-%{_modname}
+%define                modname xcache
+Summary:       %{modname} - PHP opcode cacher
+Summary(pl.UTF-8):     %{modname} - buforowanie opcodów PHP
+Name:          php-%{modname}
 Version:       1.2.2
-Release:       1
+Release:       2
 License:       BSD
 Group:         Development/Languages/PHP
 URL:           http://xcache.lighttpd.net/
 Source0:       http://xcache.lighttpd.net/pub/Releases/%{version}/xcache-%{version}.tar.bz2
 # Source0-md5: 0907f62536e6f8b10f900e54e37090b9
-Source1:       %{_modname}-apache.conf
-Source2:       %{_modname}-lighttpd.conf
+Source1:       %{modname}-apache.conf
+Source2:       %{modname}-lighttpd.conf
 BuildRequires: php-devel >= 3:5.1
 BuildRequires: rpmbuild(macros) >= 1.344
 BuildRequires: sed >= 4.0
@@ -19,7 +19,7 @@ Requires:     php-common >= 4:5.0.4
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _webapps        /etc/webapps
-%define                _webapp         %{_modname}
+%define                _webapp         %{modname}
 %define                _sysconfdir     %{_webapps}/%{_webapp}
 %define                _appdir         %{_datadir}/%{_webapp}
 
@@ -31,8 +31,21 @@ 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
+Summary:       WEB interface for xCache
+Group:         Libraries
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+Requires:      webapps
+Requires:      webserver(php) >= 5.0
+
+%description web
+Via this web interface script you can manage and view statistics of
+xCache.
+
+More information you can find at %{url}.
+
 %prep
-%setup -q -n %{_modname}-%{version}
+%setup -q -n %{modname}-%{version}
 %{__sed} -i -e '
        s,zend_extension =.*,zend_extension = %{php_extensiondir}/xcache.so,
        s,zend_extension_ts = .*,zend_extension_ts = %{php_extensiondir}/xcache.so,
@@ -54,11 +67,11 @@ install -d $RPM_BUILD_ROOT{%{php_sysconfdir}/conf.d,%{_sysconfdir}}
        INSTALL_ROOT=$RPM_BUILD_ROOT
 
 # The cache directory where pre-compiled files will reside
-install -d $RPM_BUILD_ROOT/var/cache/php-%{_modname}
+install -d $RPM_BUILD_ROOT/var/cache/php-%{modname}
 install -d $RPM_BUILD_ROOT%{_appdir}
 
 # Drop in the bit of configuration
-install xcache.ini $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/%{_modname}.ini
+install xcache.ini $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/%{modname}.ini
 install admin/* $RPM_BUILD_ROOT%{_appdir}
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
@@ -76,32 +89,37 @@ if [ "$1" = 0 ]; then
        %php_webserver_restart
 fi
 
-%triggerin -- apache1 < 1.3.37-3, apache1-base
+%triggerin web -- apache1 < 1.3.37-3, apache1-base
 %webapp_register apache %{_webapp}
 
-%triggerun -- apache1 < 1.3.37-3, apache1-base
+%triggerun web -- apache1 < 1.3.37-3, apache1-base
 %webapp_unregister apache %{_webapp}
 
-%triggerin -- apache < 2.2.0, apache-base
+%triggerin web -- apache < 2.2.0, apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache < 2.2.0, apache-base
+%triggerun web -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
-%triggerin -- lighttpd
+%triggerin web -- lighttpd
 %webapp_register lighttpd %{_webapp}
 
-%triggerun -- lighttpd
+%triggerun web -- lighttpd
 %webapp_unregister lighttpd %{_webapp}
 
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS README THANKS
+%config(noreplace) %verify(not md5 mtime size) %{php_sysconfdir}/conf.d/%{modname}.ini
+%attr(755,root,root) %{php_extensiondir}/%{modname}.so
+
+# XXX: what for this dir is used?
+%dir %attr(775,root,http) /var/cache/php-xcache
+
+%files web
+%defattr(644,root,root,755)
 %dir %attr(750,root,http) %{_sysconfdir}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lighttpd.conf
-%config(noreplace) %verify(not md5 mtime size) %{php_sysconfdir}/conf.d/%{_modname}.ini
-%attr(755,root,root) %{php_extensiondir}/%{_modname}.so
 %{_appdir}
-%dir %attr(775,root,http) /var/cache/php-xcache