diff options
author | Bret McMillan <bretm@redhat.com> | 2008-12-01 16:01:03 -0500 |
---|---|---|
committer | Bret McMillan <bretm@redhat.com> | 2008-12-01 16:01:03 -0500 |
commit | 18db6eca063f55aa1422af82b2bd3c772e16474c (patch) | |
tree | 0df211233f85a4e7f0cdc46118ab1db44d2e34f2 | |
parent | 36a3f4a8c41c00726540af60ff6adda4669bd1ba (diff) | |
parent | 048ef1106d9658bc08277619c1d816dc94f129a1 (diff) | |
download | wordpress-mu-18db6eca063f55aa1422af82b2bd3c772e16474c.tar.gz wordpress-mu-18db6eca063f55aa1422af82b2bd3c772e16474c.tar.xz wordpress-mu-18db6eca063f55aa1422af82b2bd3c772e16474c.zip |
Merge branch 'fedora-10' into fedora-10-updates-testing
-rw-r--r-- | README.fedora | 9 | ||||
-rw-r--r-- | htaccess.dist | 32 | ||||
-rw-r--r-- | wordpress-mu-httpd-conf | 25 | ||||
-rw-r--r-- | wordpress-mu.spec | 120 |
4 files changed, 160 insertions, 26 deletions
diff --git a/README.fedora b/README.fedora new file mode 100644 index 0000000..61b32ec --- /dev/null +++ b/README.fedora @@ -0,0 +1,9 @@ +Fedora-specific packaging notes: + +* WordPress-MU is installed by default to something like: + www.foo.com/wordpress-mu/ + +* the content of htaccess.dist has been ported to a conf.d-compatible config file + +* if you utilize SSL, please review http://codex.wordpress.org/Administration_Over_SSL + diff --git a/htaccess.dist b/htaccess.dist index a10abfe..0c5a33a 100644 --- a/htaccess.dist +++ b/htaccess.dist @@ -1,26 +1,6 @@ -RewriteEngine On -RewriteBase BASE/ - -#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] - -<IfModule mod_security.c> -<Files async-upload.php> -SecFilterEngine Off -SecFilterScanPOST Off -</Files> -</IfModule> - +# NOTICE: contents moved to wordpress-mu-httpd-conf +# +# That file gets dropped into /etc/httpd/conf.d/wordpress-mu.conf +# +# Need to keep this here so that wpmu's current installer still works, +# and so that rpmlint isn't unhappy w/ an empty file. 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 + +<Directory /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] +</Directory> + diff --git a/wordpress-mu.spec b/wordpress-mu.spec new file mode 100644 index 0000000..69610f7 --- /dev/null +++ b/wordpress-mu.spec @@ -0,0 +1,120 @@ +Summary: WordPress-MU multi-user blogging software +URL: http://mu.wordpress.org/latest.tar.gz +Name: wordpress-mu +Version: 2.6.1 +Release: 2%{?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 "<?php // update script removed, updates via RPMs for Fedora ?>" > 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} +# remove these as well, detritus +rm -f %{buildroot}%{_datadir}/wordpress-mu/{wordpress-mu-httpd-conf,README.fedora} + + +%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 +%doc README.fedora +%{_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 <bretm@redhat.com> - 2.6.1-1 +- update to 2.6.1 + +* Tue Jul 29 2008 Bret McMillan <bretm@redhat.com> - 2.6-7 +- added build section to the spec file + +* Wed Jul 29 2008 Bret McMillan <bretm@redhat.com> - 2.6-6 +- rebasing to wpmu 2.6 + +* Fri May 30 2008 Bret McMillan <bretm@redhat.com> - 1.5.1-2 +- trying to clean up how we're dealing with htaccess.dist + +* Mon May 26 2008 Bret McMillan <bretm@redhat.com> - 1.5.1-1 +- update to 1.5.1; getting ready for Fedora submission + +* Fri Apr 25 2008 Bret McMillan <bretm@redhat.com> - 1.3.3-1 +- initial version; copying heuristics from the base fedora wordpress pkg + |