X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=php.spec;h=676d38dc23653d05a13fcc9cd9fed514516c166b;hb=b9440d42f33edff0f0a154f369c5f9d6e8313ed8;hp=5beafb876bca06aca49d259b233b85b4ac2205f7;hpb=bec43244967d8ead96b8a8808f9a3a81e328d12d;p=packages%2Fphp.git

diff --git a/php.spec b/php.spec
index 5beafb8..676d38d 100644
--- a/php.spec
+++ b/php.spec
@@ -283,7 +283,7 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		php_sysconfdir		/etc/%{name}
 %define		php_extensiondir	%{_libdir}/%{name}
-%define		php_datadir		/usr/share/%{name}
+%define		php_datadir		/usr/share/php/%{name}
 %define		_sysconfdir		%{php_sysconfdir}
 
 # must be in sync with source. extra check ensuring that it is so is done in %%build
@@ -570,7 +570,6 @@ Requires:	libtool >= 2:2.4.6
 %{?with_pcre:Requires:	pcre-devel >= 8.10}
 Requires:	shtool
 Provides:	php-devel = %{epoch}:%{version}-%{release}
-Obsoletes:	php-devel
 Obsoletes:	php-pear-devel
 Obsoletes:	php4-devel
 Obsoletes:	php52-devel
@@ -2926,6 +2925,7 @@ fi
 %dir %{_sysconfdir}/conf.d
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php.ini
 %attr(755,root,root) %{_libdir}/libphp_common-*.so
+%dir %{php_datadir}
 %dir %{php_extensiondir}
 
 %doc ext/session/mod_files.sh