From 6de551bcce242afdba75ee9b7ff56dbd4fb95ba9 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 07:18:58 +0000 Subject: [PATCH 1/5] Initialize branch F-12 for wordpress-mu --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From 1d7240f51ab44c0ef68a681218ae77b5df50eb58 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:18:11 +0000 Subject: [PATCH 2/5] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 70626f2..58736f5 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: wordpress-mu -# $Id$ +# $Id: Makefile,v 1.1 2008/08/25 19:55:16 kevin Exp $ NAME := wordpress-mu 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 2c5d9769c8c7309a48c6878a7e5aa954b4154f90 Mon Sep 17 00:00:00 2001 From: Bret Richard McMillan Date: Mon, 30 Nov 2009 22:12:42 +0000 Subject: [PATCH 3/5] update to 2.8.6 --- .cvsignore | 4 +--- sources | 4 +--- wordpress-mu.spec | 5 ++++- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index dc0df2e..fd7d8a5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1 @@ -wordpress-mu-2.7.tar.gz -wordpress-mu-2.8.2.tar.gz -wordpress-mu-2.8.4a.tar.gz +wordpress-mu-2.8.6.tar.gz diff --git a/sources b/sources index 5fcaff5..7244037 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -b7d119c663833a3fe00d30224530447e wordpress-mu-2.7.tar.gz -5b412d16fdcc590698af565aa50d046c wordpress-mu-2.8.2.tar.gz -72dcdfaa60ede87d320b479579028d5e wordpress-mu-2.8.4a.tar.gz +dfa27af33afe0c206933e509edd5835c wordpress-mu-2.8.6.tar.gz diff --git a/wordpress-mu.spec b/wordpress-mu.spec index 741e55a..b537d05 100644 --- a/wordpress-mu.spec +++ b/wordpress-mu.spec @@ -1,7 +1,7 @@ Summary: WordPress-MU multi-user blogging software URL: http://mu.wordpress.org/latest.tar.gz Name: wordpress-mu -Version: 2.8.4a +Version: 2.8.6 Release: 1%{?dist} Group: Applications/Publishing License: GPLv2 @@ -99,6 +99,9 @@ rm -rf %{buildroot} %dir %{_sysconfdir}/wordpress-mu %changelog +* Mon Nov 30 2009 Bret McMillan - 2.8.6-1 +- update to 2.8.6; couple of security fixes including 1 XSS + * Wed Aug 12 2009 Bret McMillan - 2.8.4a-1 - Update to WordPress MU 2.8.4a; several security fixes included From 81665bb7a8d23c34bb1428b38d0ec3b1c6066922 Mon Sep 17 00:00:00 2001 From: Bret Richard McMillan Date: Fri, 29 Jan 2010 18:52:15 +0000 Subject: [PATCH 4/5] update to 2.9.1.1 --- .cvsignore | 2 +- sources | 2 +- wordpress-mu.spec | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index fd7d8a5..6ced768 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wordpress-mu-2.8.6.tar.gz +wordpress-mu-2.9.1.1.tar.gz diff --git a/sources b/sources index 7244037..33adc56 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dfa27af33afe0c206933e509edd5835c wordpress-mu-2.8.6.tar.gz +85ffe0c80032257e99ca65c8fe978d3a wordpress-mu-2.9.1.1.tar.gz diff --git a/wordpress-mu.spec b/wordpress-mu.spec index b537d05..efc076a 100644 --- a/wordpress-mu.spec +++ b/wordpress-mu.spec @@ -1,7 +1,7 @@ Summary: WordPress-MU multi-user blogging software URL: http://mu.wordpress.org/latest.tar.gz Name: wordpress-mu -Version: 2.8.6 +Version: 2.9.1.1 Release: 1%{?dist} Group: Applications/Publishing License: GPLv2 @@ -99,6 +99,11 @@ rm -rf %{buildroot} %dir %{_sysconfdir}/wordpress-mu %changelog +* Fri Jan 29 2010 Bret McMillan - 2.9.1.1-1 +- collected bug fixes and enhancements from wordpress 2.9.x merged into wpmu 2.9.1 +- Plugins options fix: http://trac.mu.wordpress.org/ticket/1193 +- wp_getUserBlogs fix: http://trac.mu.wordpress.org/ticket/1195 + * Mon Nov 30 2009 Bret McMillan - 2.8.6-1 - update to 2.8.6; couple of security fixes including 1 XSS From 6b84d8bf424907d6b1acd7e28606c55f8e925b48 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:23:57 +0000 Subject: [PATCH 5/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 58736f5..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: wordpress-mu -# $Id: Makefile,v 1.1 2008/08/25 19:55:16 kevin Exp $ -NAME := wordpress-mu -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 $$d/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/branch b/branch deleted file mode 100644 index 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12 diff --git a/import.log b/import.log deleted file mode 100644 index 83b639a..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -wordpress-mu-2_6_1-1_fc8:HEAD:wordpress-mu-2.6.1-1.fc8.src.rpm:1220452323