packages: wordpress-mu/wordpress-mu.spec, wordpress-mu/pld.patch (NEW) - ad...

[glen]

Author: glen                         Date: Thu Nov 19 14:45:31 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add pld.patch
- some cosmetics

---- Files affected:
packages/wordpress-mu:
   wordpress-mu.spec (1.3 -> 1.4) , pld.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/wordpress-mu/wordpress-mu.spec
diff -u packages/wordpress-mu/wordpress-mu.spec:1.3 packages/wordpress-mu/wordpress-mu.spec:1.4
--- packages/wordpress-mu/wordpress-mu.spec:1.3	Thu Nov 19 13:40:42 2009
+++ packages/wordpress-mu/wordpress-mu.spec	Thu Nov 19 15:45:25 2009
@@ -5,13 +5,14 @@
 Summary(en.UTF-8):	WordPress µ
 Name:		wordpress-mu
 Version:	2.8.6
-Release:	0.10
+Release:	0.11
 License:	GPL
 Group:		Applications/Publishing
 Source0:	http://mu.wordpress.org/%{name}-%{version}.tar.gz
 # Source0-md5:	dfa27af33afe0c206933e509edd5835c
 URL:		http://mu.wordpress.org/
 Source1:	apache.conf
+Patch0:		pld.patch
 Source2:	lighttpd.conf
 Requires:	php-gettext
 Requires:	php-mysql
@@ -59,7 +60,9 @@
 pozostawienie plików instalacyjnych mogłoby być niebezpieczne.
 
 %prep
-%setup -q -n %{name}
+%setup -qc
+mv %{name}/* .; rmdir %{name}
+%patch0 -p1
 
 rm wp-content/themes/index.php
 rm wp-content/mu-plugins/index.php
@@ -71,7 +74,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_appdir},%{_bindir},%{_sysconfdir},%{_appdir}/wp-content/languages}
+install -d $RPM_BUILD_ROOT{%{_appdir},%{_sbindir},%{_sysconfdir},%{_appdir}/wp-content/languages}
 
 cp -a . $RPM_BUILD_ROOT%{_appdir}
 cp -a wp-config-sample.php $RPM_BUILD_ROOT%{_sysconfdir}/wp-config.php
@@ -149,13 +152,17 @@
 %{_appdir}/wp-content/themes/default
 %{_appdir}/wp-content/themes/home
 
+# -setup package
+%exclude %{_appdir}/index-install.php
+
 %files setup
 %defattr(644,root,root,755)
-#%attr(755,root,root) %{_bindir}/wp-secure
-#%attr(755,root,root) %{_bindir}/wp-setup
+#%attr(755,root,root) %{_sbindir}/wpmu-secure
+#%attr(755,root,root) %{_sbindir}/wpmu-setup
 #%{_appdir}/wp-secure.sh
 #%{_appdir}/wp-setup.sh
 %{_appdir}/wp-admin
+%{_appdir}/index-install.php
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -163,6 +170,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2009/11/19 14:45:25  glen
+- add pld.patch
+- some cosmetics
+
 Revision 1.3  2009/11/19 12:40:42  glen
 - add -l en.UTF-8
 

================================================================
Index: packages/wordpress-mu/pld.patch
diff -u /dev/null packages/wordpress-mu/pld.patch:1.1
--- /dev/null	Thu Nov 19 15:45:32 2009
+++ packages/wordpress-mu/pld.patch	Thu Nov 19 15:45:25 2009
@@ -0,0 +1,11 @@
+--- wordpress-mu-2.8.6/index-install.php~	2009-11-19 14:39:53.000000000 +0200
++++ wordpress-mu-2.8.6/index-install.php	2009-11-19 14:42:58.870091243 +0200
+@@ -288,7 +288,7 @@
+ 		<h2>Warning!</h2>
+ 		<div style='border: 1px solid #ccc'>
+ 			<p style='font-weight: bold; padding-left: 10px'>One or more of the directories must be made writeable by the webserver. You will be reminded to reset the permissions at the end of the install.<br />
+-				Please <code>chmod 777 <q>directory-name</q></code> or <code>chown</code> that directory to the user the web server runs as (usually nobody, apache, or www-data)<br />
++				Please <code>chmod 777 <q>directory-name</q></code> or <code>chown</code> that directory to the user the web server runs as (usually "nobody", "apache", or "www-data", "http" in PLD Linux)<br />
+ 				Refresh this page when you're done!<br /></p>
+ 		</div>
+ 		<p>Quick fix:<br /> <code>chmod&nbsp;777&nbsp;<?php
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wordpress-mu/wordpress-mu.spec?r1=1.3&r2=1.4&f=u