upgrade to Wordpress 2.6.2 and add a local copy of Akismet (to be able to upgrade to a newer version in the future)

wordpress/wordpress.spec

@@ -22,7 +22,8 @@
 ##
 
 #   package versions
-%define       V_wordpress            2.6.1
+%define       V_wordpress            2.6.2
+%define       V_plugin_akismet       2.1.8
 %define       V_plugin_dbmanager     2.31
 %define       V_plugin_pagenavi      2.31
 %define       V_plugin_polls         2.31
@@ -46,7 +47,7 @@ Class:        PLUS
 Group:        CMS
 License:      GPL
 Version:      %{V_wordpress}
-Release:      20080815
+Release:      20080909
 
 #   list of sources
 Source0:      http://wordpress.org/wordpress-%{V_wordpress}.tar.gz
@@ -54,17 +55,18 @@ Source1:      wordpress-apache.conf
 Source2:      wordpress-setup.sh
 Source3:      wordpress-cron.sh
 Source4:      rc.wordpress
-Source10:     http://downloads.wordpress.org/plugin/wp-dbmanager.%{V_plugin_dbmanager}.zip
-Source11:     http://downloads.wordpress.org/plugin/wp-pagenavi.%{V_plugin_pagenavi}.zip
-Source12:     http://downloads.wordpress.org/plugin/wp-polls.%{V_plugin_polls}.zip
-Source13:     http://downloads.wordpress.org/plugin/wp-postviews.%{V_plugin_postviews}.zip
-Source14:     http://downloads.wordpress.org/plugin/wp-print.%{V_plugin_print}.zip
-Source15:     http://downloads.wordpress.org/plugin/wp-relativedate.%{V_plugin_relativedate}.zip
-Source16:     http://downloads.wordpress.org/plugin/wp-ban.%{V_plugin_ban}.zip
-Source17:     http://www.sonsofskadi.net/wp-content/upload/af-extended-live-archive-%{V_plugin_ela}.zip
-Source18:     http://downloads.wordpress.org/plugin/stats.%{V_plugin_stats}.zip
-Source19:     http://www.theblog.ca/wp-content/uploads/2008/08/peterantispam%{V_plugin_peterantispam}.zip
-Source20:     http://downloads.wordpress.org/plugin/wp-hashcash.%{V_plugin_hashcash}.zip
+Source10:     ftp://ftp.openpkg.org/sources/CPY/VERSIONED/akismet/akismet-%{V_plugin_akismet}.zip
+Source11:     http://downloads.wordpress.org/plugin/wp-dbmanager.%{V_plugin_dbmanager}.zip
+Source12:     http://downloads.wordpress.org/plugin/wp-pagenavi.%{V_plugin_pagenavi}.zip
+Source13:     http://downloads.wordpress.org/plugin/wp-polls.%{V_plugin_polls}.zip
+Source14:     http://downloads.wordpress.org/plugin/wp-postviews.%{V_plugin_postviews}.zip
+Source15:     http://downloads.wordpress.org/plugin/wp-print.%{V_plugin_print}.zip
+Source16:     http://downloads.wordpress.org/plugin/wp-relativedate.%{V_plugin_relativedate}.zip
+Source17:     http://downloads.wordpress.org/plugin/wp-ban.%{V_plugin_ban}.zip
+Source18:     http://www.sonsofskadi.net/wp-content/upload/af-extended-live-archive-%{V_plugin_ela}.zip
+Source19:     http://downloads.wordpress.org/plugin/stats.%{V_plugin_stats}.zip
+Source20:     http://www.theblog.ca/wp-content/uploads/2008/08/peterantispam%{V_plugin_peterantispam}.zip
+Source21:     http://downloads.wordpress.org/plugin/wp-hashcash.%{V_plugin_hashcash}.zip
 Patch0:       wordpress.patch
 Patch1:       wordpress.patch.ela
 
@@ -93,6 +95,11 @@ AutoReqProv:  no
         url       = http://wordpress.org/download/release-archive/
         regex     = wordpress-(\d+\.\d+(\.\d+)?)\.tar\.gz
     }
+    prog wordpress:plugin-akismet = {
+        version   = %{V_plugin_akismet}
+        url       = http://wordpress.org/extend/plugins/akismet/download/
+        regex     = akismet\.(__VER__)\.zip
+    }
     prog wordpress:plugin-dbmanager = {
         version   = %{V_plugin_dbmanager}
         url       = http://lesterchan.net/wordpress/readme/wp-dbmanager.html
@@ -162,6 +169,7 @@ AutoReqProv:  no
     %{l_prefix}/bin/unzip -q -o -x %{SOURCE18}
     %{l_prefix}/bin/unzip -q -o -x %{SOURCE19}
     %{l_prefix}/bin/unzip -q -o -x %{SOURCE20}
+    %{l_prefix}/bin/unzip -q -o -x %{SOURCE21}
     %patch -p0
     %patch -p0 -d af-extended-live-archive -P 1
     rm -f af-extended-live-archive/*.orig
@@ -192,6 +200,10 @@ AutoReqProv:  no
     cp -rp wordpress/* $RPM_BUILD_ROOT%{l_prefix}/libexec/wordpress/
     find $RPM_BUILD_ROOT%{l_prefix}/libexec/wordpress -name "*.orig" -print | xargs rm -f
 
+    #   update akismet plugin
+    cp -rp akismet/* \
+        $RPM_BUILD_ROOT%{l_prefix}/libexec/wordpress/wp-content/plugins/akismet/
+
     #   install plugins
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/libexec/wordpress/wp-content/backup-db \