packages: wordpress/wordpress.spec - use %undos macro - rm *.orig files - u...

pawelz pawelz at pld-linux.org
Wed Apr 7 13:24:35 CEST 2010


Author: pawelz                       Date: Wed Apr  7 11:24:35 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use %undos macro
- rm *.orig files
- updated *.mo files

---- Files affected:
packages/wordpress:
   wordpress.spec (1.54 -> 1.55) 

---- Diffs:

================================================================
Index: packages/wordpress/wordpress.spec
diff -u packages/wordpress/wordpress.spec:1.54 packages/wordpress/wordpress.spec:1.55
--- packages/wordpress/wordpress.spec:1.54	Fri Apr  2 12:15:15 2010
+++ packages/wordpress/wordpress.spec	Wed Apr  7 13:24:30 2010
@@ -16,11 +16,12 @@
 Source4:	%{name}-apache.conf
 Source5:	%{name}-lighttpd.conf
 Source6:	http://svn.automattic.com/wordpress-i18n/et/tags/2.9/messages/et.mo
-# Source6-md5:	b2d16a3bc8099fec4d19085fc3c3e122
+# Source6-md5:	7a3e3008c58a56e1c8777a9a1b404787
 Source7:	http://svn.automattic.com/wordpress-i18n/pl_PL/tags/2.9/messages/pl_PL.mo
-# Source7-md5:	8e50b17edb96ebd67d1d547dc78479e7
+# Source7-md5:	a68aba62c7301da37ad0e05c1a5ca143
 Patch0:		%{name}.patch
 URL:		http://wordpress.org/
+BuildRequires:	rpm-build-macros >= 1.553
 Requires:	php-gettext
 Requires:	php-mysql
 Requires:	php-pcre
@@ -77,7 +78,8 @@
 cp %{SOURCE3} .
 rm -f license.txt
 
-find '(' -name '*.php' -o -name '*.js' -o -name '*.html' ')' -print0 | xargs -0 %{__sed} -i -e 's,\r$,,'
+find '(' -name '*.php' -o -name '*.js' -o -name '*.html' ')' -print0 | xargs -0 %undos
+find -name '*.orig' | xargs rm
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -181,6 +183,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.55  2010/04/07 11:24:30  pawelz
+- use %undos macro
+- rm *.orig files
+- updated *.mo files
+
 Revision 1.54  2010/04/02 10:15:15  pawelz
 - up to 2.9.2
 - also update *.mo files
================================================================

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



More information about the pld-cvs-commit mailing list