packages: wordpress/wordpress.patch, wordpress/wordpress.spec - make out of...

[glen]

Author: glen                         Date: Wed Sep  8 09:10:05 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- make out of the box config still work

---- Files affected:
packages/wordpress:
   wordpress.patch (1.2 -> 1.3) , wordpress.spec (1.60 -> 1.61) 

---- Diffs:

================================================================
Index: packages/wordpress/wordpress.patch
diff -u packages/wordpress/wordpress.patch:1.2 packages/wordpress/wordpress.patch:1.3
--- packages/wordpress/wordpress.patch:1.2	Sat Jan 30 17:41:13 2010
+++ packages/wordpress/wordpress.patch	Wed Sep  8 11:10:00 2010
@@ -25,3 +25,22 @@
  		foreach( $configFile as $line ) {
  			fwrite($handle, $line);
  		}
+--- wordpress-3.0.1/wp-config.php~	2010-09-08 12:02:37.000000000 +0300
++++ wordpress-3.0.1/wp-config.php	2010-09-08 12:05:20.193097026 +0300
+@@ -16,13 +16,13 @@
+ 
+ // ** MySQL settings - You can get this info from your web host ** //
+ /** The name of the database for WordPress */
+-define('DB_NAME', 'database_name_here');
++define('DB_NAME', 'wordpress');
+ 
+ /** MySQL database username */
+-define('DB_USER', 'username_here');
++define('DB_USER', 'mysql');
+ 
+ /** MySQL database password */
+-define('DB_PASSWORD', 'password_here');
++define('DB_PASSWORD', '');
+ 
+ /** MySQL hostname */
+ define('DB_HOST', 'localhost');

================================================================
Index: packages/wordpress/wordpress.spec
diff -u packages/wordpress/wordpress.spec:1.60 packages/wordpress/wordpress.spec:1.61
--- packages/wordpress/wordpress.spec:1.60	Wed Sep  8 11:02:23 2010
+++ packages/wordpress/wordpress.spec	Wed Sep  8 11:10:00 2010
@@ -6,7 +6,7 @@
 Summary(pl.UTF-8):	Osobisty system publikacji
 Name:		wordpress
 Version:	3.0.1
-Release:	0.1
+Release:	0.2
 License:	GPL v2
 Group:		Applications/Publishing
 Source0:	http://wordpress.org/%{name}-%{version}.tar.gz
@@ -80,6 +80,8 @@
 %prep
 %setup -qc
 mv %{name}/* . && rmdir %{name}
+%undos -f php,js,html
+cp -a wp-config{-sample,}.php
 %patch0 -p1
 cp -a %{SOURCE3} .
 rm -f license.txt
@@ -93,7 +95,6 @@
 cp -a %{SOURCE10} wp-includes/rss.php
 cp -a %{SOURCE11} wp-includes/rss-functions.php
 
-%undos -f php,js,html
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
 %build
@@ -106,7 +107,7 @@
 install -d $RPM_BUILD_ROOT{%{_appdir},%{_bindir},%{_sysconfdir},%{_appdir}/wp-content/languages}
 
 cp -a . $RPM_BUILD_ROOT%{_appdir}
-cp -a wp-config-sample.php $RPM_BUILD_ROOT%{_sysconfdir}/wp-config.php
+mv $RPM_BUILD_ROOT{%{_appdir},%{_sysconfdir}}/wp-config.php
 rm -f $RPM_BUILD_ROOT%{_appdir}/readme.html
 rm -f $RPM_BUILD_ROOT%{_appdir}/wp-setup.txt
 
@@ -199,6 +200,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.61  2010/09/08 09:10:00  glen
+- make out of the box config still work
+
 Revision 1.60  2010/09/08 09:02:23  glen
 - update i18n as well
 
================================================================

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