SPECS: php.spec - rel 3; don't rely on libtool detection

arekm arekm at pld-linux.org
Sun Dec 7 11:12:09 CET 2008


Author: arekm                        Date: Sun Dec  7 10:12:09 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 3; don't rely on libtool detection

---- Files affected:
SPECS:
   php.spec (1.756 -> 1.757) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.756 SPECS/php.spec:1.757
--- SPECS/php.spec:1.756	Sat Dec  6 17:23:32 2008
+++ SPECS/php.spec	Sun Dec  7 11:12:03 2008
@@ -85,7 +85,7 @@
 %undefine	with_filter
 %endif
 
-%define		rel 2
+%define		rel 3
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):	Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):	Język skryptowy PHP
@@ -2087,16 +2087,16 @@
 mv $RPM_BUILD_ROOT%{_sysconfdir}/{conf.d/{ncurses,pcntl,readline}.ini,cli.d}
 
 # use system automake and {lib,sh}tool
-if [ -f %{_datadir}/libtool/config/ltmain.sh; then
+%if "%{pld_release}" != "ac"
 	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
+%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
+%endif
 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
@@ -2920,6 +2920,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.757  2008/12/07 10:12:03  arekm
+- rel 3; don't rely on libtool detection
+
 Revision 1.756  2008/12/06 16:23:32  glen
 - pld-th specific conded
 
================================================================

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



More information about the pld-cvs-commit mailing list