packages: php/php.spec - dropped unused BR: fcgi-devel, flex, judy-devel, l...

[sparky]

Author: sparky                       Date: Sat Feb  6 17:25:09 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- dropped unused BR: fcgi-devel, flex, judy-devel, libtiff-devel, libwrap-devel
- replaced configure option magic with __with_without macros
- fix build with xmlrpc-epi
- pass rpmcppflags

---- Files affected:
packages/php:
   php.spec (1.836 -> 1.837) 

---- Diffs:

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.836 packages/php/php.spec:1.837
--- packages/php/php.spec:1.836	Tue Feb  2 17:47:58 2010
+++ packages/php/php.spec	Sat Feb  6 18:25:03 2010
@@ -181,9 +181,9 @@
 BuildRequires:	cyrus-sasl-devel
 BuildRequires:	db-devel >= 4.0
 BuildRequires:	elfutils-devel
-BuildRequires:	fcgi-devel
+#BuildRequires:	fcgi-devel
 %{?with_fdf:BuildRequires:	fdftk-devel}
-BuildRequires:	flex
+#BuildRequires:	flex
 BuildRequires:	pkgconfig
 %if %{with mssql} || %{with sybase_ct}
 BuildRequires:	freetds-devel >= 0.82
@@ -201,13 +201,13 @@
 BuildRequires:	libltdl-devel >= 1.4
 BuildRequires:	libmcrypt-devel >= 2.4.4
 BuildRequires:	libpng-devel >= 1.0.8
-BuildRequires:	libtiff-devel
+#BuildRequires:	libtiff-devel
 %if "%{pld_release}" != "ac"
 BuildRequires:	libtool >= 2:2.2
 %else
 BuildRequires:	libtool >= 1.4.3
 %endif
-BuildRequires:	libwrap-devel
+#BuildRequires:	libwrap-devel
 BuildRequires:	libxml2-devel >= 2.5.10
 BuildRequires:	libxslt-devel >= 1.1.0
 %{?with_mm:BuildRequires:	mm-devel >= 1.3.0}
@@ -224,7 +224,7 @@
 %{?with_recode:BuildRequires:	recode-devel >= 3.5d-3}
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-build >= 4.4.0
-BuildRequires:	rpmbuild(macros) >= 1.519
+BuildRequires:	rpmbuild(macros) >= 1.527
 %{?with_sqlite:BuildRequires:	sqlite-devel}
 %{?with_sqlite3:BuildRequires:	sqlite3-devel >= 3.3.9}
 BuildRequires:	t1lib-devel
@@ -241,7 +241,7 @@
 BuildRequires:	apr-util-devel >= 1:1.0.0
 %endif
 %if %{with fpm}
-BuildRequires:	judy-devel
+#BuildRequires:	judy-devel
 BuildRequires:	libevent-devel >= 1.4.7-3
 %endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -1757,6 +1757,8 @@
 
 %patch11 -p4
 
+sed -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' ext/xmlrpc/config.m4
+
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
@@ -1777,7 +1779,7 @@
 rm -rf ext/pcre/pcrelib
 rm -rf ext/pdo_sqlite/sqlite
 #rm -rf ext/soap/interop
-rm -rf ext/xmlrpc/libxmlrpc
+rm -r ext/xmlrpc/libxmlrpc
 
 cp -af Zend/LICENSE{,.Zend}
 
@@ -1815,7 +1817,8 @@
 	touch _built-conf
 fi
 export PROG_SENDMAIL="/usr/lib/sendmail"
-export CPPFLAGS="-DDEBUG_FASTCGI -DHAVE_STRNDUP"
+export CPPFLAGS="-DDEBUG_FASTCGI -DHAVE_STRNDUP %{rpmcppflags} \
+	-I%{_includedir}/xmlrpc-epi"
 
 sapis="
 cgi-fcgi cli
@@ -1933,7 +1936,7 @@
 	--enable-xml=shared \
 	--enable-xmlreader=shared \
 	--with-bz2=shared \
-	%{!?with_curl:--without-curl}%{?with_curl:--with-curl=shared} \
+	%{__with_without curl curl shared} \
 	--with-db4 \
 	%{?with_fdf:--with-fdftk=shared} \
 	--with-iconv=shared \
@@ -1954,11 +1957,11 @@
 	%{?with_oci8:--with-oci8=shared} \
 	%{?with_openssl:--with-openssl=shared} \
 	--with-kerberos \
-	%{!?with_pcre:--without-pcre-regex}%{?with_pcre:--with-pcre-regex=/usr} \
-	%{!?with_filter:--disable-filter}%{?with_filter:--enable-filter=shared} \
+	%{__with_without pcre pcre-regex /usr} \
+	%{__enable_disable filter filter shared} \
 	--with-pear=%{php_pear_dir} \
-	%{!?with_pgsql:--without-pgsql}%{?with_pgsql:--with-pgsql=shared,/usr} \
-	%{!?with_phar:--disable-phar}%{?with_phar:--enable-phar=shared} \
+	%{__with_without pgsql pgsql shared,/usr} \
+	%{__enable_disable phar phar shared} \
 	--with-png-dir=/usr \
 	%{?with_pspell:--with-pspell=shared} \
 	--with-readline=shared \
@@ -1967,11 +1970,11 @@
 	%{?with_snmp:--with-snmp=shared} \
 	%{?with_sybase_ct:--with-sybase-ct=shared,/usr} \
 	%{!?with_sqlite:--without-sqlite --without-pdo-sqlite}%{?with_sqlite:--with-sqlite=shared,/usr --enable-sqlite-utf8} \
-	%{!?with_sqlite3:--without-sqlite3}%{?with_sqlite3:--with-sqlite3=shared,/usr} \
+	%{__with_without sqlite3 sqlite3 shared,/usr} \
 	--with-t1lib=shared \
 	%{?with_tidy:--with-tidy=shared} \
 	%{?with_odbc:--with-unixODBC=shared,/usr} \
-	%{!?with_xmlrpc:--without-xmlrpc}%{?with_xmlrpc:--with-xmlrpc=shared,/usr} \
+	%{__with_without xmlrpc xmlrpc shared,/usr} \
 	--with-xsl=shared \
 	--with-zlib=shared \
 	--with-zlib-dir=shared,/usr \
@@ -2970,6 +2973,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837  2010/02/06 17:25:03  sparky
+- dropped unused BR: fcgi-devel, flex, judy-devel, libtiff-devel, libwrap-devel
+- replaced configure option magic with __with_without macros
+- fix build with xmlrpc-epi
+- pass rpmcppflags
+
 Revision 1.836  2010/02/02 16:47:58  pawelz
 - move php.litespeed to %{_sbindir}. Not tested.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.836&r2=1.837&f=u