Author: glen Date: Mon Jun 1 14:10:23 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- update to build on ac
---- Files affected:
packages/php4:
php4.spec (1.635 -> 1.636)
---- Diffs:
================================================================
Index: packages/php4/php4.spec
diff -u packages/php4/php4.spec:1.635 packages/php4/php4.spec:1.636
--- packages/php4/php4.spec:1.635 Sun May 3 17:54:31 2009
+++ packages/php4/php4.spec Mon Jun 1 16:10:17 2009
@@ -172,7 +172,7 @@
%{?with_fribidi:BuildRequires: fribidi-devel >= 0.10.4}
BuildRequires: gdbm-devel
BuildRequires: gmp-devel
-%{?with_imap:BuildRequires: krb5-devel}
+%{?with_imap:BuildRequires: heimdal-devel >= 0.7}
%{?with_imap:BuildRequires: imap-devel >= 1:2001-0.BETA.200107022325.2}
%{?with_java:BuildRequires: jdk >= 1.1}
%{?with_cpdf:BuildRequires: libcpdf-devel >= 2.02r1-2}
@@ -182,11 +182,15 @@
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 >= 1.4.3
+%endif
%{?with_xml:BuildRequires: libxml2-devel >= 2.2.7}
%{?with_domxslt:BuildRequires: libxslt-devel >= 1.0.3}
%{?with_mhash:BuildRequires: mhash-devel}
-%{?with_ming:BuildRequires: ming-devel >= 0.1.0}
+%{?with_ming:BuildRequires: ming-devel >= 0.3.0}
%{?with_mm:BuildRequires: mm-devel >= 1.3.0}
%{?with_mnogosearch:BuildRequires: mnogosearch-devel >= 3.2.29}
BuildRequires: mysql-devel >= 3.23.32
@@ -205,6 +209,7 @@
%{?with_qtdom:BuildRequires: qt-devel >= 2.2.0}
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.236
%{?with_xslt:BuildRequires: sablotron-devel >= 0.96}
@@ -434,7 +439,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
Obsoletes: php-devel
%description devel
@@ -1909,11 +1918,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 "%{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
+ ln -snf %{_aclocaldir}/libtool.m4 $RPM_BUILD_ROOT%{_libdir}/php/build
+ ln -snf %{_datadir}/libtool/ltmain.sh
$RPM_BUILD_ROOT%{_libdir}/php/build
+%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
@@ -3150,6 +3164,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.636 2009/06/01 14:10:17 glen
+- update to build on ac
+
Revision 1.635 2009/05/03 15:54:31 hawk
- building with yaz is broken, no patches yet (at least I haven't found any),
no one wants to fix it so don't build yaz extension for now
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php4/php4.spec?r1=1.635&r2=1.636&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
