- versioned datadir

[packages/php.git] / php.spec

diff --git a/php.spec b/php.spec
index 72b05fdfa877fee532a9f90681a28eafa1ec8f8b..4f270f6c5ec3c70e41931c488e8245c032c566f8 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -199,7 +199,6 @@ Patch52:    pcre-shared.patch
 Patch53:       fix-test-run.patch
 Patch55:       bug-52078-fileinode.patch
 Patch59:       %{orgname}-systzdata.patch
-Patch60:       %{orgname}-oracle-instantclient.patch
 Patch62:       mcrypt-libs.patch
 Patch65:       system-libzip.patch
 Patch66:       php-db.patch
@@ -284,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
@@ -1964,7 +1963,6 @@ cp -p php.ini-production php.ini
 %undos ext/spl/tests/SplFileInfo_getInode_basic.phpt
 %patch55 -p1
 %patch59 -p1
-#%patch60 -p1
 %patch62 -p1
 %{?with_system_libzip:%patch65 -p1}
 %patch66 -p1
@@ -2928,6 +2926,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