- merged 1.10 from PLD

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

diff --git a/php-dirs.spec b/php-dirs.spec
index 149ce494c9a1fb90f52ca33ccae2c7dcb14b03f8..f5730f181e89541bbf5ec7b5d25818dbe6f7e1fc 100644 (file)
--- a/php-dirs.spec
+++ b/php-dirs.spec
@@ -1,11 +1,11 @@
 # TODO
-# - move tmpwatch S: to php-session package (as session files file storage no
+# - move tmpwatch R: to php-session package (as session files file storage no
 #   longer can cleanup itself due dir perms)
 # - https://fedorahosted.org/tmpwatch/ticket/7 is implemented in tmpwatch-2.9.16, see 3467603 todo
 Summary:       Common dirs for PHP
 Summary(pl.UTF-8):     Wspólne katalogi dla PHP
 Name:          php-dirs
-Version:       1.7
+Version:       1.10
 Release:       1
 License:       GPL
 Group:         Base
@@ -15,7 +15,7 @@ BuildRequires:        rpmbuild(macros) >= 1.644
 Requires(postun):      /usr/sbin/groupdel
 Requires(pre): /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
-Suggests:      tmpwatch
+Requires:      tmpwatch
 Conflicts:     php-pear < 4:1.4-2
 Provides:      group(http)
 BuildArch:     noarch
@@ -34,11 +34,11 @@ Wspólne katalogi dla PHP.
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/etc/cron.d,/var/{cache,log,run}/php,/var/log/archive/php} \
-       $RPM_BUILD_ROOT%{_docdir}/phpdoc \
-       $RPM_BUILD_ROOT%{_libexecdir}
+       $RPM_BUILD_ROOT%{_docdir}/phpdoc $RPM_BUILD_ROOT%{_includedir}/php \
+       $RPM_BUILD_ROOT%{_libexecdir} $RPM_BUILD_ROOT%{php_data_dir}
 
 install -p %{SOURCE0} $RPM_BUILD_ROOT%{_libexecdir}
-cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/cron.d/php-session
+sed -e 's,@libexecdir@,%{_libexecdir},' %{SOURCE1} >$RPM_BUILD_ROOT/etc/cron.d/php-session
 
 while read dir; do
        install -d $RPM_BUILD_ROOT$dir
@@ -63,9 +63,11 @@ fi
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) /etc/cron.d/php-session
 %attr(755,root,root) %{_libexecdir}/php-session.sh
-%{php_data_dir}
 
 %dir %{_docdir}/phpdoc
+%dir %{_includedir}/php
+%dir %{php_data_dir}
+
 %attr(775,root,http) %dir %verify(not group mode) /var/log/php
 %attr(770,root,root) %dir %verify(not group mode) /var/log/archive/php