[packages/php/PHP_5_3: 3/7] do the obsolete fun only when default_php is off

arekm arekm at pld-linux.org
Thu Dec 26 12:47:47 CET 2013


commit ce6e51dfb7c51822af2428d5e9a86c34fce26d0f
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Oct 8 16:11:27 2013 +0300

    do the obsolete fun only when default_php is off

 php.spec | 2 ++
 1 file changed, 2 insertions(+)
---
diff --git a/php.spec b/php.spec
index 99d539b..4938a39 100644
--- a/php.spec
+++ b/php.spec
@@ -118,6 +118,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %undefine	with_default_php
 %endif
 %else
+%if %{without default_php}
 # redefine package to obsolete old names
 %define	old_version 4:5.3.27-4
 %define	package(n:l:) \
@@ -125,6 +126,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 Obsoletes: %{!?-n:php-%1}%{?-n:%(echo %{-n*} | sed -e 's,%{php_suffix}$,,')} < %{old_version} \
 %{nil}
 %endif
+%endif
 
 %define		rel	5
 %define		orgname	php
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/7fa571ef7ac6adba77506d86836fde761e656559



More information about the pld-cvs-commit mailing list