Author: arekm Date: Mon Jun 16 08:15:42 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- don't require mime magic file to be present at build time; libtool 2.2 support
---- Files affected:
SPECS:
php.spec (1.722 -> 1.723)
---- Diffs:
================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.722 SPECS/php.spec:1.723
--- SPECS/php.spec:1.722 Tue Jun 3 21:45:14 2008
+++ SPECS/php.spec Mon Jun 16 10:15:36 2008
@@ -74,7 +74,7 @@
%undefine with_filter
%endif
-%define rel 5
+%define rel 5.1
Summary: PHP: Hypertext Preprocessor
Summary(fr.UTF-8): Le langage de script embarque-HTML PHP
Summary(pl.UTF-8): Język skryptowy PHP
@@ -135,7 +135,8 @@
Patch33: %{name}-fcgi-error_log-no-newlines.patch
Patch34: %{name}-curl-limit-speed.patch
Patch35: %{name}-ac.patch
-
+Patch36: %{name}-mime_magic.patch
+Patch37: %{name}-libtool.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}
@@ -1599,6 +1600,8 @@
%patch33 -p1
%patch34 -p1
%patch35 -p1
+%patch36 -p1
+%patch37 -p1
# conflict seems to be resolved by recode patches
rm -f ext/recode/config9.m4
@@ -1950,7 +1953,9 @@
# use system automake and {lib,sh}tool
ln -snf /usr/share/automake/config.{guess,sub}
$RPM_BUILD_ROOT%{_libdir}/php/build
-ln -snf %{_aclocaldir}/libtool.m4 $RPM_BUILD_ROOT%{_libdir}/php/build
+for i in libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4; do
+ ln -snf %{_aclocaldir}/libtool.m4 $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
@@ -2757,7 +2762,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
-Revision 1.722 2008/06/03 19:45:14 hawk
+Revision 1.723 2008/06/16 08:15:36 arekm
+- don't require mime magic file to be present at build time; libtool 2.2
support
+
+Revision 1.722 2008-06-03 19:45:14 hawk
- workaround building with autoconf 2.62, release 5
Revision 1.721 2008-05-29 20:33:27 glen
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php.spec?r1=1.722&r2=1.723&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
