From 0bcfd373692ea921f43af291cadc755296ca27b9 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@delfi.ee>
Date: Tue, 5 Jan 2016 01:17:39 +0200
Subject: [PATCH] v1.6: move /usr/share/php subdirs here; cleanup descs

more logical than keeping them in php-pear package
---
 php-dirs.spec | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/php-dirs.spec b/php-dirs.spec
index cf0b01c..d6bfc58 100644
--- 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
 #   longer can cleanup itself due dir perms)
-Summary:	Common dirs for different PHP versions
-Summary(pl.UTF-8):	Wspólne katalogi dla różnych wersji PHP
+Summary:	Common dirs for PHP
+Summary(pl.UTF-8):	Wspólne katalogi dla PHP
 Name:		php-dirs
-Version:	1.5
-Release:	2
+Version:	1.6
+Release:	1
 License:	GPL
 Group:		Base
 Source0:	php-session.sh
@@ -15,27 +15,36 @@ Requires(postun):	/usr/sbin/groupdel
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
 Suggests:	tmpwatch
+Conflicts:	php-pear < 4:1.4-2
 Provides:	group(http)
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-Common directories for PHP version 4 and version 5.
+Common directories for PHP.
 
 %description -l pl.UTF-8
-Wspólne katalogi dla PHP w wersji 4 oraz 5.
+Wspólne katalogi dla PHP.
 
 %prep
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{php_data_dir}/tests,/etc/cron.hourly,/var/{cache,log,run}/php,/var/log/archive/php} \
+install -d $RPM_BUILD_ROOT{/etc/cron.hourly,/var/{cache,log,run}/php,/var/log/archive/php} \
 	$RPM_BUILD_ROOT%{_docdir}/phpdoc \
 	$RPM_BUILD_ROOT%{systemdtmpfilesdir}
 
 install -p %{SOURCE0} $RPM_BUILD_ROOT/etc/cron.hourly
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
 
+while read dir; do
+	install -d $RPM_BUILD_ROOT$dir
+done <<EOF
+%{php_data_dir}/tests
+%{php_data_dir}/Symfony/Bridge
+%{php_data_dir}/Symfony/Component
+EOF
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -51,14 +60,16 @@ fi
 %defattr(644,root,root,755)
 %{systemdtmpfilesdir}/%{name}.conf
 %attr(755,root,root) %{_sysconfdir}/cron.hourly/php-session.sh
-%dir %{php_data_dir}
-%dir %{php_data_dir}/tests
+%{php_data_dir}
+
 %dir %{_docdir}/phpdoc
 %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
+
 # no +r, so only predictable names can be used. currently php-soap wsdl cache is there
 %attr(730,root,http) %dir %verify(not group mode) /var/cache/php
-# http needs only x for directory (otherwise it knows session file
-# names and can read it contents)
+
+# http needs only +x for directory
+# (otherwise it knows session file names and can read it contents)
 # keep o+x for fcgi.sock (lighttpd)
 %attr(731,root,http) %dir %verify(not group mode) /var/run/php
-- 
2.43.0