X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=php-dirs.spec;h=86fdb008878c05cfc511030f2e26dae4cd576668;hb=refs%2Fheads%2Fmaster;hp=149ce494c9a1fb90f52ca33ccae2c7dcb14b03f8;hpb=b8e003621b4c69250f11c33cbaa2184e6ab12752;p=packages%2Fphp-dirs.git

diff --git a/php-dirs.spec b/php-dirs.spec
index 149ce49..86fdb00 100644
--- a/php-dirs.spec
+++ b/php-dirs.spec
@@ -1,12 +1,12 @@
 # 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
-Release:	1
+Version:	1.10
+Release:	4
 License:	GPL
 Group:		Base
 Source0:	php-session.sh
@@ -15,14 +15,15 @@ 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
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_libexecdir	%{_prefix}/lib
 
+%global		debug_package	%{nil}
+
 %description
 Common directories for PHP.
 
@@ -34,11 +35,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},%{_libdir}}/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 +64,12 @@ 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 %{_libdir}/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