packages: wordpress/wordpress.spec - system pear Text_Diff, atomlib, swfobj...

[glen]

Author: glen                         Date: Thu Sep  9 13:40:41 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- system pear Text_Diff, atomlib, swfobject merged from wpmu
- cleanup .dev files (from wpmu)

---- Files affected:
packages/wordpress:
   wordpress.spec (1.69 -> 1.70) 

---- Diffs:

================================================================
Index: packages/wordpress/wordpress.spec
diff -u packages/wordpress/wordpress.spec:1.69 packages/wordpress/wordpress.spec:1.70
--- packages/wordpress/wordpress.spec:1.69	Thu Sep  9 08:44:27 2010
+++ packages/wordpress/wordpress.spec	Thu Sep  9 15:40:35 2010
@@ -8,7 +8,7 @@
 Summary(pl.UTF-8):	Osobisty system publikacji
 Name:		wordpress
 Version:	3.0.1
-Release:	0.11
+Release:	0.12
 License:	GPL v2
 Group:		Applications/Publishing
 Source0:	http://wordpress.org/%{name}-%{version}.tar.gz
@@ -26,10 +26,14 @@
 Patch1:		multisite.patch
 Patch2:		%{name}.patch
 Patch3:		simplepie.patch
+Patch4:		pear-text-diff.patch
+Patch5:		atomlib.patch
 URL:		http://www.wordpress.org/
 BuildRequires:	gettext-devel
 BuildRequires:	rpm-php-pearprov
 BuildRequires:	rpmbuild(macros) >= 1.553
+Requires:	js-swfobject >= 2.1
+Requires:	php-atomlib >= 0.4
 Requires:	php-common >= 4:%{php_min_version}
 Requires:	php-date
 Requires:	php-dom
@@ -40,6 +44,7 @@
 Requires:	php-mbstring
 Requires:	php-mysql
 Requires:	php-pcre
+Requires:	php-pear-Text_Diff
 Requires:	php-simplepie >= 1.2
 Requires:	php-spl
 Requires:	php-tokenizer
@@ -133,19 +138,36 @@
 %patch1 -p1
 cp -a wp-config{-sample,}.php
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 cp -a %{SOURCE3} .
-rm -f license.txt
 
+rm license.txt
 rm wp-content/themes/index.php
 rm wp-content/plugins/index.php
 rm wp-content/index.php
 
+# remove *.dev js/.css
+find -name *.dev.js | xargs rm -v
+find -name *.dev.css | xargs rm -v
+
 # sample plugin
 rm wp-content/plugins/hello.php
 
+# system swfobject
+rm wp-includes/js/swfobject.js
+
 # system simplepie
 rm wp-includes/class-simplepie.php
 
+# system php-pear-Text_Diff
+rm -r wp-includes/Text/Diff*
+rmdir wp-includes/Text
+
+# system atomlib
+rm wp-includes/atomlib.php
+
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
 %build
@@ -264,6 +286,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.70  2010/09/09 13:40:35  glen
+- system pear Text_Diff, atomlib, swfobject merged from wpmu
+- cleanup .dev files (from wpmu)
+
 Revision 1.69  2010/09/09 06:44:27  glen
 - scanned autodeps
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wordpress/wordpress.spec?r1=1.69&r2=1.70&f=u