- make out of the box config still work

Changed files:
    wordpress.patch -> 1.3
    wordpress.spec -> 1.61

diff --git a/wordpress.patch b/wordpress.patch
index 52edc65a3cf5374af0b10b1621cad84f232a5c5b..11e1ec24c44d556386a7341f2c3f2c652e8249f9 100644 (file)
--- a/wordpress.patch
+++ b/wordpress.patch
@@ -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');

diff --git a/wordpress.spec b/wordpress.spec
index 8a1bf32b1ef8714026a8a7c0996ad7684e929347..fbd38a15003f9f2bd4cd48b92d3aff8c4d2420dd 100644 (file)
--- a/wordpress.spec
+++ b/wordpress.spec
@@ -5,7 +5,7 @@ Summary:        Personal publishing system
 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
@@ -79,6 +79,8 @@ pozostawienie plików instalacyjnych mogłoby być niebezpieczne.
 %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
@@ -92,7 +94,6 @@ rm wp-content/index.php
 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
@@ -105,7 +106,7 @@ rm -rf $RPM_BUILD_ROOT
 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