From 00600251e6ee25dbbc523d89865089fbf6edc171 Mon Sep 17 00:00:00 2001
From: Adrian Reber <adrian@fedoraproject.org>
Date: Jul 28 2009 08:53:16 +0000
Subject: - 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

---

diff --git a/.cvsignore b/.cvsignore
index d1bf8ee..0fc74bf 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-wordpress-2.8.1.tar.gz
+wordpress-2.8.2.tar.gz
diff --git a/sources b/sources
index 577b3d4..a51df1f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b389dbbf60749ddc6c33f49740460a09  wordpress-2.8.1.tar.gz
+8fde8c4aa3e4d86ce9ddca7cdc0769a2  wordpress-2.8.2.tar.gz
diff --git a/wordpress.spec b/wordpress.spec
index c753e5b..e44c831 100644
--- a/wordpress.spec
+++ b/wordpress.spec
@@ -1,7 +1,7 @@
 Summary: WordPress blogging software
 URL: http://www.wordpress.org
 Name: wordpress
-Version: 2.8.1
+Version: 2.8.2
 Group: Applications/Publishing
 Release: 1%{?dist}
 License: GPLv2
@@ -18,9 +18,11 @@ almost trivial, to get information out to people on the web.
 
 %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}/wordpress
 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,15 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* Tue Jul 28 2009 Adrian Reber <adrian@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@lists.fedoraproject.org> - 2.8.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Jul 10 2009 Adrian Reber <adrian@lisas.de> - 2.8.1-1
 - updated to 2.8.1 for security fixes - BZ 510745