SPECS: php.spec - compat for old libtool, libtool epoch

[glen]

Author: glen                         Date: Thu Dec  4 15:09:42 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- compat for old libtool, libtool epoch

---- Files affected:
SPECS:
   php.spec (1.751 -> 1.752) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.751 SPECS/php.spec:1.752
--- SPECS/php.spec:1.751	Thu Nov 20 18:47:40 2008
+++ SPECS/php.spec	Thu Dec  4 16:09:36 2008
@@ -195,7 +195,11 @@
 BuildRequires:	libmcrypt-devel >= 2.4.4
 BuildRequires:	libpng-devel >= 1.0.8
 BuildRequires:	libtiff-devel
-BuildRequires:	libtool >= 2.2
+%if "%{pld_release}" != "ac"
+BuildRequires:	libtool >= 2:2.2
+%else
+BuildRequires:	libtool
+%endif
 BuildRequires:	libwrap-devel
 BuildRequires:	libxml2-devel >= 2.5.10
 BuildRequires:	libxslt-devel >= 1.1.0
@@ -216,6 +220,7 @@
 %{?with_pgsql:BuildRequires:	postgresql-devel}
 BuildRequires:	readline-devel
 %{?with_recode:BuildRequires:	recode-devel >= 3.5d-3}
+BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-build >= 4.4.0
 BuildRequires:	rpmbuild(macros) >= 1.238
 %{?with_sqlite:BuildRequires:	sqlite-devel}
@@ -455,7 +460,11 @@
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	autoconf
 Requires:	automake
-Requires:	libtool >= 2.2
+%if "%{pld_release}" != "ac"
+Requires:	libtool >= 2:2.2
+%else
+Requires:	libtool
+%endif
 %{?with_pcre:Requires:	pcre-devel >= 6.6}
 Requires:	shtool
 Obsoletes:	php-pear-devel
@@ -1652,7 +1661,9 @@
 %patch34 -p1
 %patch35 -p1
 %patch36 -p1
+%if "%{pld_release}" != "ac"
 %patch37 -p1
+%endif
 %patch38 -p1
 
 # mysql default charset for mysql/mysql/pdo-mysql extensions
@@ -2050,11 +2061,16 @@
 mv $RPM_BUILD_ROOT%{_sysconfdir}/{conf.d/{ncurses,pcntl,readline}.ini,cli.d}
 
 # use system automake and {lib,sh}tool
-ln -snf /usr/share/automake/config.{guess,sub} $RPM_BUILD_ROOT%{_libdir}/php/build
-for i in libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4; do
-	ln -snf %{_aclocaldir}/${i} $RPM_BUILD_ROOT%{_libdir}/php/build
-done
-ln -snf %{_datadir}/libtool/config/ltmain.sh $RPM_BUILD_ROOT%{_libdir}/php/build
+if [ -f %{_datadir}/libtool/config/ltmain.sh; then
+	ln -snf /usr/share/automake/config.{guess,sub} $RPM_BUILD_ROOT%{_libdir}/php/build
+	for i in libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4; do
+		ln -snf %{_aclocaldir}/${i} $RPM_BUILD_ROOT%{_libdir}/php/build
+	done
+	ln -snf %{_datadir}/libtool/config/ltmain.sh $RPM_BUILD_ROOT%{_libdir}/php/build
+else
+	ln -snf %{_aclocaldir}/libtool.m4 $RPM_BUILD_ROOT%{_libdir}/php/build
+	ln -snf %{_datadir}/libtool/ltmain.sh $RPM_BUILD_ROOT%{_libdir}/php/build
+fi
 ln -snf %{_bindir}/shtool $RPM_BUILD_ROOT%{_libdir}/php/build
 
 # as a result of ext/pcre/pcrelib removal in %%prep, ext/pcre/php_pcre.h
@@ -2878,6 +2894,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.752  2008/12/04 15:09:36  glen
+- compat for old libtool, libtool epoch
+
 Revision 1.751  2008/11/20 17:47:40  glen
 - fix side effect of --disable-cli disabling pear include path in non-cli sapis; rel 18
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php.spec?r1=1.751&r2=1.752&f=u