From 8435025a2af38db2f5a471a7963993306ebabfb3 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 25 Aug 2008 19:55:18 +0000 Subject: [PATCH 1/4] Initialize branch F-9 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..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 From fac6973ac0fed16eaa4cfadbda0e2a0d1b80539a Mon Sep 17 00:00:00 2001 From: Bret Richard McMillan Date: Wed, 3 Sep 2008 14:36:41 +0000 Subject: [PATCH 2/4] importing wordpress-mu 2.6.1 into the Fedora 9 branch --- .cvsignore | 1 + README.fedora.wordpress-mu | 20 +++++++ import.log | 1 + sources | 1 + wordpress-mu-httpd-conf | 25 ++++++++ wordpress-mu.spec | 116 +++++++++++++++++++++++++++++++++++++ 6 files changed, 164 insertions(+) create mode 100644 README.fedora.wordpress-mu create mode 100644 import.log create mode 100644 wordpress-mu-httpd-conf create mode 100644 wordpress-mu.spec diff --git a/.cvsignore b/.cvsignore index e69de29..8fa7925 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +wordpress-mu-2.6.1.tar.gz diff --git a/README.fedora.wordpress-mu b/README.fedora.wordpress-mu new file mode 100644 index 0000000..2fba019 --- /dev/null +++ b/README.fedora.wordpress-mu @@ -0,0 +1,20 @@ +Alias /wordpress-mu /usr/share/wordpress-mu + + + AllowOverride Options + RewriteEngine On + + RewriteBase /wordpress-mu/ + + #uploaded files + RewriteRule ^(.*/)?files/$ index.php [L] + RewriteRule ^(.*/)?files/(.*) wp-content/blogs.php?file=$2 [L] + + RewriteCond %{REQUEST_FILENAME} -f [OR] + RewriteCond %{REQUEST_FILENAME} -d + RewriteRule . - [L] + RewriteRule ^([_0-9a-zA-Z-]+/)?(wp-.*) $2 [L] + RewriteRule ^([_0-9a-zA-Z-]+/)?(.*\.php)$ $2 [L] + RewriteRule . index.php [L] + + diff --git a/import.log b/import.log new file mode 100644 index 0000000..27e6404 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +wordpress-mu-2_6_1-1_fc8:F-9:wordpress-mu-2.6.1-1.fc8.src.rpm:1220452567 diff --git a/sources b/sources index e69de29..9c9f4b4 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +231c841354005a7efdfbaa0d61fc531b wordpress-mu-2.6.1.tar.gz diff --git a/wordpress-mu-httpd-conf b/wordpress-mu-httpd-conf new file mode 100644 index 0000000..49685e8 --- /dev/null +++ b/wordpress-mu-httpd-conf @@ -0,0 +1,25 @@ +Alias /wordpress-mu /usr/share/wordpress-mu + + + AllowOverride Options + RewriteEngine On + + RewriteBase /wordpress-mu/ + + #uploaded files + RewriteRule ^(.*/)?files/$ index.php [L] + RewriteCond %{REQUEST_URI} !.*wp-content/plugins.* + RewriteRule ^(.*/)?files/(.*) wp-content/blogs.php?file=$2 [L] + + # add a trailing slash to /wp-admin + RewriteCond %{REQUEST_URI} ^.*/wp-admin$ + RewriteRule ^(.+)$ $1/ [R=301,L] + + RewriteCond %{REQUEST_FILENAME} -f [OR] + RewriteCond %{REQUEST_FILENAME} -d + RewriteRule . - [L] + RewriteRule ^([_0-9a-zA-Z-]+/)?(wp-.*) $2 [L] + RewriteRule ^([_0-9a-zA-Z-]+/)?(.*\.php)$ $2 [L] + RewriteRule . index.php [L] + + diff --git a/wordpress-mu.spec b/wordpress-mu.spec new file mode 100644 index 0000000..f8817db --- /dev/null +++ b/wordpress-mu.spec @@ -0,0 +1,116 @@ +Summary: WordPress-MU multi-user blogging software +URL: http://mu.wordpress.org/latest.tar.gz +Name: wordpress-mu +Version: 2.6.1 +Release: 1%{?dist} +Group: Applications/Publishing +License: GPLv2 +Source0: %{name}-%{version}.tar.gz +Source1: wordpress-mu-httpd-conf +Source2: README.fedora.wordpress-mu +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires: php >= 4.1.0, httpd, php-mysql +BuildArch: noarch + +%description +WordPress-MU is a derivative of the WordPress blogging codebase, to allow +one instance to serve multiple users. + +%prep +%setup -q + +# disable-wordpress-core-update, updates are always installed via rpm +# +# the sed script from wordpress.spec doesn't work due to if/else statement in upstream wordpress-mu's update.php +# sed -i -e "s,add_action,#add_action,g" wp-includes/update.php + +echo "" > wp-includes/update.php + +%build + + +%install +rm -rf %{buildroot} + +mkdir -p %{buildroot}%{_datadir}/wordpress-mu +mkdir -p %{buildroot}%{_sysconfdir}/wordpress-mu +install -m 0644 -D -p %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/wordpress-mu.conf +install -m 0644 -D -p %{SOURCE2} %{buildroot}%{_docdir}/%{name}-%{version}/README.fedora + +cp -pr * %{buildroot}%{_datadir}/wordpress-mu + +# fix weird upstream perms... +chmod 0644 %{buildroot}%{_datadir}/wordpress-mu/wp-includes/js/tinymce/plugins/spellchecker/css/content.css +chmod 0664 %{buildroot}%{_datadir}/wordpress-mu/wp-includes/js/tinymce/plugins/spellchecker/editor_plugin.js +chmod 0664 %{buildroot}%{_datadir}/wordpress-mu/wp-includes/js/tinymce/plugins/spellchecker/config.php + + +# since we're using /etc/httpd/conf.d, don't do the funky .htaccess stuff +# that the installer wants +echo "# please see /etc/httpd/conf.d/wordpress-mu.conf" > %{buildroot}%{_datadir}/wordpress-mu/htaccess.dist + + +# Remove empty files to make rpmlint happy +find %{buildroot} -empty -exec rm -f {} \; +# These are docs, remove them from here, docify them later +rm -f %{buildroot}%{_datadir}/wordpress-mu/{license.txt,README.txt} + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root,-) +%config(noreplace) %{_sysconfdir}/httpd/conf.d/wordpress-mu.conf +%dir %{_datadir}/wordpress-mu +%{_datadir}/wordpress-mu/htaccess.dist +%{_datadir}/wordpress-mu/wp-admin +%{_datadir}/wordpress-mu/wp-content +%{_datadir}/wordpress-mu/wp-includes +%{_datadir}/wordpress-mu/index.php +%doc license.txt +%doc README.txt +%{_datadir}/wordpress-mu/index-install.php +%{_datadir}/wordpress-mu/wp-activate.php +%{_datadir}/wordpress-mu/wp-atom.php +%{_datadir}/wordpress-mu/wp-app.php +%{_datadir}/wordpress-mu/wp-blog-header.php +%{_datadir}/wordpress-mu/wp-comments-post.php +%{_datadir}/wordpress-mu/wp-commentsrss2.php +%{_datadir}/wordpress-mu/wp-config-sample.php +%{_datadir}/wordpress-mu/wp-cron.php +%{_datadir}/wordpress-mu/wp-feed.php +%{_datadir}/wordpress-mu/wp-load.php +%{_datadir}/wordpress-mu/wp-links-opml.php +%{_datadir}/wordpress-mu/wp-login.php +%{_datadir}/wordpress-mu/wp-mail.php +%{_datadir}/wordpress-mu/wp-pass.php +%{_datadir}/wordpress-mu/wp-rdf.php +%{_datadir}/wordpress-mu/wp-rss.php +%{_datadir}/wordpress-mu/wp-rss2.php +%{_datadir}/wordpress-mu/wp-settings.php +%{_datadir}/wordpress-mu/wpmu-settings.php +%{_datadir}/wordpress-mu/wp-signup.php +%{_datadir}/wordpress-mu/wp-trackback.php +%{_datadir}/wordpress-mu/xmlrpc.php +%{_datadir}/wordpress-mu/favicon.ico +%dir %{_sysconfdir}/wordpress-mu + +%changelog +* Wed Sep 3 2008 Bret McMillan - 2.6.1-1 +- update to 2.6.1 + +* Tue Jul 29 2008 Bret McMillan - 2.6-7 +- added build section to the spec file + +* Wed Jul 29 2008 Bret McMillan - 2.6-6 +- rebasing to wpmu 2.6 + +* Fri May 30 2008 Bret McMillan - 1.5.1-2 +- trying to clean up how we're dealing with htaccess.dist + +* Mon May 26 2008 Bret McMillan - 1.5.1-1 +- update to 1.5.1; getting ready for Fedora submission + +* Fri Apr 25 2008 Bret McMillan - 1.3.3-1 +- initial version; copying heuristics from the base fedora wordpress pkg + From fb595eaa23dc6fb249b39d005deeebb3661177a2 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:18:12 +0000 Subject: [PATCH 3/4] 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 26baffeac586ddcfb6fc74ca3020c1545ed54c5c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:24:00 +0000 Subject: [PATCH 4/4] 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 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9 diff --git a/import.log b/import.log deleted file mode 100644 index 27e6404..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -wordpress-mu-2_6_1-1_fc8:F-9:wordpress-mu-2.6.1-1.fc8.src.rpm:1220452567