rpms/wordpress/devel .cvsignore, 1.24, 1.25 sources, 1.24, 1.25 wordpress.spec, 1.31, 1.32

[Adrian Reber]

Author: adrian

Update of /cvs/extras/rpms/wordpress/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15908

Modified Files:
	.cvsignore sources wordpress.spec 
Log Message:
* Tue Jul 28 2009 Adrian Reber <adrian at lisas.de> - 2.8.2-1
- updated to 2.8.2 for security fixes - BZ 512900
- fixed "wrong-script-end-of-line-encoding" of license.txt
- correctly disable auto update check
- fixed an error message from 'find' during the build



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wordpress/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	10 Jul 2009 19:28:57 -0000	1.24
+++ .cvsignore	28 Jul 2009 08:38:31 -0000	1.25
@@ -1 +1 @@
-wordpress-2.8.1.tar.gz
+wordpress-2.8.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wordpress/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	10 Jul 2009 19:28:57 -0000	1.24
+++ sources	28 Jul 2009 08:38:31 -0000	1.25
@@ -1 +1 @@
-b389dbbf60749ddc6c33f49740460a09  wordpress-2.8.1.tar.gz
+8fde8c4aa3e4d86ce9ddca7cdc0769a2  wordpress-2.8.2.tar.gz


Index: wordpress.spec
===================================================================
RCS file: /cvs/extras/rpms/wordpress/devel/wordpress.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- wordpress.spec	27 Jul 2009 07:22:27 -0000	1.31
+++ wordpress.spec	28 Jul 2009 08:38:31 -0000	1.32
@@ -1,9 +1,9 @@
 Summary: WordPress blogging software
 URL: http://www.wordpress.org
 Name: wordpress
-Version: 2.8.1
+Version: 2.8.2
 Group: Applications/Publishing
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: GPLv2
 Source0: http://wordpress.org/%{name}-%{version}.tar.gz
 Source1: wordpress-httpd-conf
@@ -18,9 +18,11 @@ almost trivial, to get information out t
 
 %prep
 %setup -q -n wordpress
-# disable-wordpress-core-update, updates are always installed via rpm
-# this does not disable the wordpress-plugins-update check
-sed -i -e "s,^add_action,#add_action,g" wp-includes/update.php
+# disable wp_version_check, updates are always installed via rpm
+sed -i -e "s,\(.*\)'wp_version_check'\(.*\),#\1'wp_version_check'\2,g" \
+	wp-includes/update.php
+# fix file encoding
+sed -i -e 's/\r//' license.txt
 
 %install
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/wordpress
@@ -28,11 +30,11 @@ mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}
 install -m 0644 -D -p %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/conf.d/wordpress.conf
 cp -pr * ${RPM_BUILD_ROOT}%{_datadir}/wordpress
 cat wp-config-sample.php | sed -e "s|dirname(__FILE__).'/'|'/usr/share/wordpress/'|g" > \
-    ${RPM_BUILD_ROOT}%{_sysconfdir}/wordpress/wp-config.php
+	${RPM_BUILD_ROOT}%{_sysconfdir}/wordpress/wp-config.php
 /bin/ln -sf ../../../etc/wordpress/wp-config.php ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-config.php
 /bin/cp %{SOURCE2} ./README.fedora
 # Remove empty files to make rpmlint happy
-find ${RPM_BUILD_ROOT} -empty -exec rm -f {} \;
+find ${RPM_BUILD_ROOT} -type f -empty -exec rm -f {} \;
 # These are docs, remove them from here, docify them later
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/wordpress/{license.txt,readme.html}
 
@@ -75,6 +77,12 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* Tue Jul 28 2009 Adrian Reber <adrian at lisas.de> - 2.8.2-1
+- updated to 2.8.2 for security fixes - BZ 512900
+- fixed "wrong-script-end-of-line-encoding" of license.txt
+- correctly disable auto update check
+- fixed an error message from 'find' during the build
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild