SPECS: php4.spec - rel 14; libtool 2.2 support; freetds 0.82 support

[arekm]

Author: arekm                        Date: Mon Jun 16 09:15:58 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 14; libtool 2.2 support; freetds 0.82 support

---- Files affected:
SPECS:
   php4.spec (1.616 -> 1.617) 

---- Diffs:

================================================================
Index: SPECS/php4.spec
diff -u SPECS/php4.spec:1.616 SPECS/php4.spec:1.617
--- SPECS/php4.spec:1.616	Tue Jun  3 22:54:13 2008
+++ SPECS/php4.spec	Mon Jun 16 11:15:52 2008
@@ -74,7 +74,7 @@
 %undefine	with_msession
 %endif
 
-%define		rel 13
+%define		rel 14
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):	Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):	Język skryptowy PHP
@@ -146,6 +146,8 @@
 Patch47:	%{name}-ming.patch
 Patch48:	%{name}-fcgi-graceful.patch
 Patch49:	%{name}-ac.patch
+Patch50:	%{name}-mime_magic.patch
+Patch51:	%{name}-tds.patch
 URL:		http://www.php.net/
 %{?with_interbase:%{!?with_interbase_inst:BuildRequires:	Firebird-devel >= 1.0.2.908-2}}
 %{?with_pspell:BuildRequires:	aspell-devel >= 2:0.50.0}
@@ -166,7 +168,7 @@
 %{?with_fdf:BuildRequires:	fdftk-devel}
 BuildRequires:	flex
 %if %{with mssql} || %{with sybase}
-BuildRequires:	freetds-devel
+BuildRequires:	freetds-devel >= 0.82
 %endif
 BuildRequires:	freetype-devel >= 2.0
 %{?with_fribidi:BuildRequires:	fribidi-devel >= 0.10.4}
@@ -182,7 +184,7 @@
 BuildRequires:	libmcrypt-devel >= 2.4.4
 BuildRequires:	libpng-devel >= 1.0.8
 BuildRequires:	libtiff-devel
-BuildRequires:	libtool >= 1.4.3
+BuildRequires:	libtool >= 2.2
 %{?with_xml:BuildRequires:	libxml2-devel >= 2.2.7}
 %{?with_domxslt:BuildRequires:	libxslt-devel >= 1.0.3}
 %{?with_mhash:BuildRequires:	mhash-devel}
@@ -434,6 +436,7 @@
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	autoconf
 Requires:	automake
+Requires:	libtool >= 2.2
 Obsoletes:	php-devel
 
 %description devel
@@ -1602,6 +1605,8 @@
 %patch47 -p1
 %patch48 -p1
 %patch49 -p1
+%patch50 -p1
+%patch51 -p1
 
 %if %{with hardening}
 zcat %{SOURCE8} | patch -p1
@@ -1905,6 +1910,14 @@
 # for CLI SAPI only
 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
+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
 # isn't installed by install-headers make target, we do it manually here.
 # this header file is required by e.g. filter PECL extension
@@ -3141,7 +3154,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.616  2008/06/03 20:54:13  hawk
+Revision 1.617  2008/06/16 09:15:52  arekm
+- rel 14; libtool 2.2 support; freetds 0.82 support
+
+Revision 1.616  2008-06-03 20:54:13  hawk
 - workarounded autoconf 2.62 issue, but still doesn't build, release 13
 
 Revision 1.615  2008-05-26 15:46:56  adamg
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php4.spec?r1=1.616&r2=1.617&f=u