Преглед на файлове

try to get ELA plugin running by applying an unofficial patch and remove simpletagging plugin as this more or less conflicts with Wordpress 2.3's new internal tagging and a new version is not available, too

Ralf S. Engelschall преди 18 години
родител
ревизия
285dd8c305
променени са 2 файла, в които са добавени 1090 реда и са изтрити 21 реда
  1. 1079 0
      wordpress/wordpress.patch.ela
  2. 11 21
      wordpress/wordpress.spec

Файловите разлики са ограничени, защото са твърде много
+ 1079 - 0
wordpress/wordpress.patch.ela


+ 11 - 21
wordpress/wordpress.spec

@@ -24,7 +24,6 @@
 
 #   package versions
 %define       V_wordpress            2.3
-%define       V_plugin_simpletagging 1-6
 %define       V_plugin_dbmanager     220
 %define       V_plugin_pagenavi      220
 %define       V_plugin_polls         221
@@ -54,17 +53,17 @@ Source1:      wordpress-apache.conf
 Source2:      wordpress-setup.sh
 Source3:      wordpress-cron.sh
 Source4:      rc.wordpress
-Source10:     http://sw-guide.de/_mw-uploads/simple-tagging_%{V_plugin_simpletagging}.zip
-Source11:     http://lesterchan.net/others/downloads/wp-dbmanager%{V_plugin_dbmanager}.zip
-Source12:     http://lesterchan.net/others/downloads/wp-pagenavi%{V_plugin_pagenavi}.zip
-Source13:     http://lesterchan.net/others/downloads/wp-polls%{V_plugin_polls}.zip
-Source14:     http://lesterchan.net/others/downloads/wp-postviews%{V_plugin_postviews}.zip
-Source15:     http://lesterchan.net/others/downloads/wp-print%{V_plugin_print}.zip
-Source16:     http://lesterchan.net/others/downloads/wp-relativedate%{V_plugin_relativedate}.zip
-Source17:     http://lesterchan.net/others/downloads/wp-stats%{V_plugin_stats}.zip
-Source18:     http://lesterchan.net/others/downloads/wp-ban%{V_plugin_ban}.zip
-Source19:     http://www.sonsofskadi.net/wp-content/upload/af-extended-live-archive-%{V_plugin_ela}.zip
+Source10:     http://lesterchan.net/others/downloads/wp-dbmanager%{V_plugin_dbmanager}.zip
+Source11:     http://lesterchan.net/others/downloads/wp-pagenavi%{V_plugin_pagenavi}.zip
+Source12:     http://lesterchan.net/others/downloads/wp-polls%{V_plugin_polls}.zip
+Source13:     http://lesterchan.net/others/downloads/wp-postviews%{V_plugin_postviews}.zip
+Source14:     http://lesterchan.net/others/downloads/wp-print%{V_plugin_print}.zip
+Source15:     http://lesterchan.net/others/downloads/wp-relativedate%{V_plugin_relativedate}.zip
+Source16:     http://lesterchan.net/others/downloads/wp-stats%{V_plugin_stats}.zip
+Source17:     http://lesterchan.net/others/downloads/wp-ban%{V_plugin_ban}.zip
+Source18:     http://www.sonsofskadi.net/wp-content/upload/af-extended-live-archive-%{V_plugin_ela}.zip
 Patch0:       wordpress.patch
+Patch1:       wordpress.patch.ela
 
 #   build information
 Prefix:       %{l_prefix}
@@ -90,12 +89,6 @@ AutoReqProv:  no
         url       = http://wordpress.org/download/release-archive/
         regex     = wordpress-(\d+\.\d+(\.\d+)?)\.tar\.gz
     }
-    prog wordpress:plugin-simpletagging = {
-        version   = %{V_plugin_simpletagging}
-        url       = http://sw-guide.de/wordpress/wordpress-plugins/simple-tagging-plugin/
-        regex     = Download\s+Latest\s+Version\s+(\d+\.\d+)
-        transform = "s/^(\d+)\.(\d+)$/$1-$2/s, $_"
-    }
     prog wordpress:plugin-dbmanager = {
         version   = %{V_plugin_dbmanager}
         url       = http://lesterchan.net/wordpress/readme/wp-dbmanager.html
@@ -161,8 +154,8 @@ AutoReqProv:  no
     %{l_prefix}/bin/unzip -q -o -x %{SOURCE16}
     %{l_prefix}/bin/unzip -q -o -x %{SOURCE17}
     %{l_prefix}/bin/unzip -q -o -x %{SOURCE18}
-    %{l_prefix}/bin/unzip -q -o -x %{SOURCE19}
     %patch -p0
+    %patch -p0 -d af-extended-live-archive -P 1
 
 %build
     #   create configuration file
@@ -192,7 +185,6 @@ AutoReqProv:  no
     #   install plugins
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/libexec/wordpress/wp-content/backup-db \
-        $RPM_BUILD_ROOT%{l_prefix}/libexec/wordpress/wp-content/plugins/simpletagging \
         $RPM_BUILD_ROOT%{l_prefix}/libexec/wordpress/wp-content/plugins/dbmanager \
         $RPM_BUILD_ROOT%{l_prefix}/libexec/wordpress/wp-content/plugins/pagenavi \
         $RPM_BUILD_ROOT%{l_prefix}/libexec/wordpress/wp-content/plugins/polls \
@@ -202,8 +194,6 @@ AutoReqProv:  no
         $RPM_BUILD_ROOT%{l_prefix}/libexec/wordpress/wp-content/plugins/stats \
         $RPM_BUILD_ROOT%{l_prefix}/libexec/wordpress/wp-content/plugins/ban \
         $RPM_BUILD_ROOT%{l_prefix}/libexec/wordpress/wp-content/plugins/ela
-    cp -rp simple-tagging/simpletagging* \
-        $RPM_BUILD_ROOT%{l_prefix}/libexec/wordpress/wp-content/plugins/simpletagging/
     cp -rp dbmanager/* \
         $RPM_BUILD_ROOT%{l_prefix}/libexec/wordpress/wp-content/plugins/dbmanager/
     cp -rp pagenavi/pagenavi* \