packages: wpmu/wpmu.spec - does not use xmlrpc ext, add wpmu.lua - update deps

[glen]

Author: glen                         Date: Thu May 13 13:29:21 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- does not use xmlrpc ext, add wpmu.lua
- update deps

---- Files affected:
packages/wpmu:
   wpmu.spec (1.20 -> 1.21) 

---- Diffs:

================================================================
Index: packages/wpmu/wpmu.spec
diff -u packages/wpmu/wpmu.spec:1.20 packages/wpmu/wpmu.spec:1.21
--- packages/wpmu/wpmu.spec:1.20	Thu May 13 15:03:02 2010
+++ packages/wpmu/wpmu.spec	Thu May 13 15:29:15 2010
@@ -4,6 +4,8 @@
 # - system jquery, scriptaculos, prototype, swfobject 2.1
 # - no system codepress 0.9.6: codepress.js is modified
 # - no system tinymce 3.2.7: themes and "inlinepopups", "media", "paste" plugins are modified
+%include	/usr/lib/rpm/macros.php
+%define		php_min_version 5.2.1
 Summary:	WordPress MU
 Summary(en.UTF-8):	WordPress µ
 Name:		wpmu
@@ -15,24 +17,34 @@
 # Source0-md5:	3dff1dd886414ef80ffddba7a33172bf
 URL:		http://mu.wordpress.org/
 Source1:	apache.conf
+Source2:	lighttpd.conf
+Source3:	http://www.bisente.com/%{name}.lua
+# Source3-md5:	97df526f5261f57a3bbaaadac0bd112a
 Patch0:		pld.patch
 Patch1:		wp_queries.patch
 Patch2:		configpath.patch
-Source2:	lighttpd.conf
 BuildRequires:	/usr/bin/php
 Requires:	js-swfobject >= 2.1
-Requires:	php-common >= 4:5.0
+Requires:	php-common >= 4:%{php_min_version}
 Requires:	php-gettext
 Requires:	php-mysql
 Requires:	php-pcre
 Requires:	php-xml
-Requires:	php-xmlrpc
 Requires:	webapps
 Requires:	webserver(php)
 Obsoletes:	wordpress-mu
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# no pear deps
+%define		_noautopear	pear
+
+# exclude optional php dependencies
+%define		_noautophp	php-date php-ftp php-dom php-gd php-hash php-iconv php-json php-libxml php-mbstring php-openssl php-simplexml php-spl php-tokenizer php-xmlreader
+
+# put it together for rpmbuild
+%define		_noautoreq	%{?_noautophp} %{?_noautopear}
+
 %define		_appdir		%{_datadir}/%{name}
 %define		_webapps	/etc/webapps
 %define		_webapp		%{name}
@@ -145,6 +157,7 @@
 touch $RPM_BUILD_ROOT%{_sysconfdir}/wp-config.php
 cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
 cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
+cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}
 cp -a $RPM_BUILD_ROOT%{_sysconfdir}/{apache,httpd}.conf
 rm $RPM_BUILD_ROOT%{_appdir}/{README.txt,license.txt,htaccess.dist}
 
@@ -198,6 +211,7 @@
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lighttpd.conf
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/wp-config.php
+%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/wpmu.lua
 
 %{_appdir}/wp-content/blogs.php
 
@@ -243,6 +257,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2010/05/13 13:29:15  glen
+- does not use xmlrpc ext, add wpmu.lua
+- update deps
+
 Revision 1.20  2010/05/13 13:03:02  glen
 - use dep via php-common
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wpmu/wpmu.spec?r1=1.20&r2=1.21&f=u