From f924abe3190ba245f8fc99646fa5ee5d8ca19afe Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 22 Apr 2008 01:25:50 +0000 Subject: [PATCH 1/8] Initialize branch F-9 for wordpress --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 From 54cca5a5b85e24605fd7bf7d8bb28911a5bf16fc Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Mon, 28 Apr 2008 09:13:55 +0000 Subject: [PATCH 2/8] - updated to 2.5.1 for security fixes - BZ 444396 --- .cvsignore | 2 +- sources | 2 +- wordpress.spec | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4ae8ebe..24e6943 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wordpress-2.3.3.tar.gz +wordpress-2.5.1.tar.gz diff --git a/sources b/sources index 0d3293d..bc725d1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -19518de1117aa68f0c3de84b6858efc3 wordpress-2.3.3.tar.gz +b1a40387006e54dcbd963d0cb5da0df4 wordpress-2.5.1.tar.gz diff --git a/wordpress.spec b/wordpress.spec index 0d88a56..9aac101 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.5.1 Group: Applications/Publishing -Release: 0%{?dist} +Release: 1%{?dist} License: GPLv2 Source0: http://wordpress.org/%{name}-%{version}.tar.gz Source1: wordpress-httpd-conf @@ -73,6 +73,9 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* 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 From b1c9e889cd2b385f3903d92f365608cc7e3c8c7e Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Thu, 28 Aug 2008 21:19:34 +0000 Subject: [PATCH 3/8] - updated to 2.6.1 --- .cvsignore | 2 +- sources | 2 +- wordpress.spec | 12 ++++++++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 24e6943..707a490 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wordpress-2.5.1.tar.gz +wordpress-2.6.1.tar.gz diff --git a/sources b/sources index bc725d1..691533e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b1a40387006e54dcbd963d0cb5da0df4 wordpress-2.5.1.tar.gz +0353f7690e7a3ebddd530b21cc980846 wordpress-2.6.1.tar.gz diff --git a/wordpress.spec b/wordpress.spec index 9aac101..19894a7 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -1,7 +1,7 @@ Summary: WordPress blogging software URL: http://www.wordpress.org Name: wordpress -Version: 2.5.1 +Version: 2.6.1 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -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,12 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* 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 From d076bd6b9a6950d619a95073ef62a3619474c47c Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Tue, 9 Sep 2008 08:33:07 +0000 Subject: [PATCH 4/8] - updated to 2.6.2 --- .cvsignore | 2 +- sources | 2 +- wordpress.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 707a490..4edf12b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wordpress-2.6.1.tar.gz +wordpress-2.6.2.tar.gz diff --git a/sources b/sources index 691533e..afe5d29 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0353f7690e7a3ebddd530b21cc980846 wordpress-2.6.1.tar.gz +87cd53c95231774c95b8e116a50807d0 wordpress-2.6.2.tar.gz diff --git a/wordpress.spec b/wordpress.spec index 19894a7..7c6dbc4 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -1,7 +1,7 @@ Summary: WordPress blogging software URL: http://www.wordpress.org Name: wordpress -Version: 2.6.1 +Version: 2.6.2 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -75,6 +75,9 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* 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 From 5315c48042ac210f29c90b3bd4a5b96daecaf611 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Fri, 24 Oct 2008 06:06:23 +0000 Subject: [PATCH 5/8] - updated to 2.6.3 --- .cvsignore | 2 +- sources | 2 +- wordpress.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4edf12b..8276998 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wordpress-2.6.2.tar.gz +wordpress-2.6.3.tar.gz diff --git a/sources b/sources index afe5d29..8265a11 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -87cd53c95231774c95b8e116a50807d0 wordpress-2.6.2.tar.gz +c3300c2b615861f3bfffdd9701e8dd97 wordpress-2.6.3.tar.gz diff --git a/wordpress.spec b/wordpress.spec index 7c6dbc4..20bdc1a 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -1,7 +1,7 @@ Summary: WordPress blogging software URL: http://www.wordpress.org Name: wordpress -Version: 2.6.2 +Version: 2.6.3 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -75,6 +75,9 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* 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 From dfb1be32d1ca78cc99a3d36be8a3dab2a4c41366 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Wed, 26 Nov 2008 09:28:25 +0000 Subject: [PATCH 6/8] - updated to 2.6.5 --- .cvsignore | 2 +- sources | 2 +- wordpress.spec | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 8276998..fae44df 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wordpress-2.6.3.tar.gz +wordpress-2.6.5.tar.gz diff --git a/sources b/sources index 8265a11..b30dd47 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c3300c2b615861f3bfffdd9701e8dd97 wordpress-2.6.3.tar.gz +066433e2b6d090e7d4c4cce49cf9b232 wordpress-2.6.5.tar.gz diff --git a/wordpress.spec b/wordpress.spec index 20bdc1a..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.6.3 +Version: 2.6.5 Group: Applications/Publishing -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Source0: http://wordpress.org/%{name}-%{version}.tar.gz Source1: wordpress-httpd-conf @@ -75,6 +75,9 @@ 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 From 4a3bda61620c3d29866db9f8153354ae5c43e2bf Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:18:06 +0000 Subject: [PATCH 7/8] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b7ae9bc..f25a67e 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 +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 5fdec63bc0b2838c95e20059b495df13250d3931 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:23:49 +0000 Subject: [PATCH 8/8] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch 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 f25a67e..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 $$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 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9