From cfb6f787e0a4ed77b80886aefbca630fafc247f7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Tue, 31 Jul 2012 06:24:14 +0300 Subject: [PATCH] - private lib and config dir from other php versions --- php.spec | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/php.spec b/php.spec index 924b7a1..2fa7f93 100644 --- a/php.spec +++ b/php.spec @@ -11,6 +11,13 @@ # - recheck: define PDO_MYSQL_UNIX_ADDR (ensure if's correct with mysql-libs and mysqlng) # - uses libvpx for webp support, should use libwebp-devel instead? # - fpm -qn check fails, as it still loads /etc/php/php.ini +# - co-install with php 5.3: +# file /etc/rc.d/init.d/php-fpm from install of php54-fpm-5.4.5-0.2.i686 conflicts with file from package php-fpm-5.3.14-1.i686 +# file /usr/sbin/php-fpm from install of php54-fpm-5.4.5-0.2.i686 conflicts with file from package php-fpm-5.3.14-1.i686 +# file /usr/share/man/man8/php-fpm.8.gz from install of php54-fpm-5.4.5-0.2.i686 conflicts with file from package php-fpm-5.3.14-1.i686 +# file /usr/bin/php.cli from install of php54-cli-5.4.5-0.2.i686 conflicts with file from package php-cli-5.3.14-1.i686 +# file /usr/share/man/man1/php.1.gz from install of php54-cli-5.4.5-0.2.i686 conflicts with file from package php-cli-5.3.14-1.i686 +# file /usr/bin/php.cgi from install of php54-cgi-5.4.5-0.2.i686 conflicts with file from package php-cgi-5.3.14-1.i686 # NOTE: mysqlnd does not support ssl or compression (see FAQ at http://dev.mysql.com/downloads/connector/php-mysqlnd/) # UNPACKAGED EXTENSION NOTES: # - com_dotnet is Win32-only @@ -126,7 +133,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules. %define orgname php %define php_suffix 54 -%define rel 0.1 +%define rel 0.2 Summary: PHP: Hypertext Preprocessor Summary(fr.UTF-8): Le langage de script embarque-HTML PHP Summary(pl.UTF-8): Język skryptowy PHP @@ -302,8 +309,8 @@ BuildRequires: libevent-devel >= 1.4.7-3 %endif BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define php_sysconfdir /etc/php -%define php_extensiondir %{_libdir}/php +%define php_sysconfdir /etc/%{name} +%define php_extensiondir %{_libdir}/%{name} %define _sysconfdir %{php_sysconfdir} # must be in sync with source. extra check ensuring that it is so is done in %%build @@ -474,7 +481,7 @@ The php-embedded package contains a library which can be embedded into applications to provide PHP scripting language support. %description embedded -l pl.UTF-8 -Ten pakiet zawiera bibliotekę, którą można osadzać w aplikacjach w +Ten pakiet zawiera bibliotekę, którą można osadzać w aplikacjach w celu obsługi PHP jako języka skryptowego. %package program @@ -575,8 +582,10 @@ Requires: libtool %endif %{?with_pcre:Requires: pcre-devel >= 8.10} Requires: shtool +Obsoletes: php-devel Obsoletes: php-pear-devel Obsoletes: php4-devel +Obsoletes: php52-devel %description devel The php-devel package lets you compile dynamic extensions to PHP. -- 2.43.0