diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 4ae8ebe..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -wordpress-2.3.3.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..fae44df --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +wordpress-2.6.5.tar.gz diff --git a/Makefile b/Makefile deleted file mode 100644 index b7ae9bc..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: wordpress -# $Id$ -NAME := wordpress -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/sources b/sources index 0d3293d..b30dd47 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -19518de1117aa68f0c3de84b6858efc3 wordpress-2.3.3.tar.gz +066433e2b6d090e7d4c4cce49cf9b232 wordpress-2.6.5.tar.gz diff --git a/wordpress.spec b/wordpress.spec index 0d88a56..a89b412 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -1,9 +1,9 @@ Summary: WordPress blogging software URL: http://www.wordpress.org Name: wordpress -Version: 2.3.3 +Version: 2.6.5 Group: Applications/Publishing -Release: 0%{?dist} +Release: 2%{?dist} License: GPLv2 Source0: http://wordpress.org/%{name}-%{version}.tar.gz Source1: wordpress-httpd-conf @@ -19,7 +19,8 @@ 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 -sed -i -e "s,add_action,#add_action,g" wp-includes/update.php +# this does not disable the wordpress-plugins-update check +sed -i -e "s,^add_action,#add_action,g" wp-includes/update.php %install mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/wordpress @@ -60,6 +61,7 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/wordpress/wp-cron.php %{_datadir}/wordpress/wp-feed.php %{_datadir}/wordpress/wp-links-opml.php +%{_datadir}/wordpress/wp-load.php %{_datadir}/wordpress/wp-login.php %{_datadir}/wordpress/wp-mail.php %{_datadir}/wordpress/wp-pass.php @@ -73,6 +75,24 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* Wed Nov 26 2008 Adrian Reber - 2.6.5-2 +- updated to 2.6.5 + +* Fri Oct 24 2008 Adrian Reber - 2.6.3-1 +- updated to 2.6.3 + +* Tue Sep 09 2008 Adrian Reber - 2.6.2-1 +- updated to 2.6.2 + +* Sun Aug 24 2008 Adrian Reber - 2.6.1-1 +- updated to 2.6.1 + +* Mon Jul 21 2008 Adrian Reber - 2.6-1 +- updated to 2.6 + +* Sat Apr 26 2008 Adrian Reber - 2.5.1-1 +- updated to 2.5.1 for security fixes - BZ 444396 + * Fri Feb 8 2008 John Berninger - 2.3.3-0 - update to 2.3.3 for security fixes - BZ 431547