Explorar el Código

cleanup plugin installation by providing an own default 'plugins' file

Ralf S. Engelschall hace 21 años
padre
commit
6791c8280b
Se han modificado 2 ficheros con 86 adiciones y 47 borrados
  1. 73 0
      kwiki/kwiki-plugins.txt
  2. 13 47
      kwiki/kwiki.spec

+ 73 - 0
kwiki/kwiki-plugins.txt

@@ -0,0 +1,73 @@
+##
+##  plugins -- Kwiki List of Active Plugins
+##
+##  Run "@l_prefix@/bin/kwiki -update" after making changes to
+##  this file. See also http://www.kwiki.org/?InstallingPlugins
+##
+
+#   Mandatory Standard Plugins
+#   [DO NOT REMOVE]
+Kwiki::Display
+Kwiki::Edit
+Kwiki::Theme::Basic
+Kwiki::Toolbar
+Kwiki::Status
+Kwiki::Widgets
+
+#   Recommended Additional Plugins
+Kwiki::Icons::Crystal
+Kwiki::Archive::Rcs
+Kwiki::Revisions
+Kwiki::Diff
+Kwiki::Search
+Kwiki::NewPage
+Kwiki::RecentChanges
+Kwiki::TimeZone
+Kwiki::UserName
+Kwiki::UserPreferences
+Kwiki::ParagraphBlocks
+Kwiki::PreformattedBlocks
+Kwiki::HtmlBlocks
+Kwiki::ShortcutLinks
+
+#   Additional Wiki Interface Extensions
+#Kwiki::BreadCrumbs
+#Kwiki::Favorites
+#Kwiki::GuestBook
+#Kwiki::RecentChangesRSS
+
+#   Additional WAFL Syntax Extensions
+#Kwiki::GoogleLink
+#Kwiki::AnchorLink
+#Kwiki::Image
+#Kwiki::PageInclude
+#Kwiki::PageTemplate
+#Kwiki::Comments
+
+#   Additional Text Block Formatters
+#Kwiki::ShellBlocks
+#Kwiki::PodBlocks
+#Kwiki::Formatter::Pod
+#Kwiki::Autoformat
+#Kwiki::GDGraphGenerator
+#Kwiki::MindMap
+#Kwiki::VimMode
+
+#   Optional Editing Authorization
+#Kwiki::User::Remote
+#Kwiki::Edit::RequireUsername
+#Kwiki::AuthorOnlyPageEditing
+#Kwiki::Scode
+
+#   Esoteric UI Rendering Alternatives
+#Kwiki::Theme::Klassik
+#Kwiki::Icons::Gnome
+#Kwiki::Toolbar::List
+
+#   Esoteric Extension Plugins
+#Kwiki::Email
+#Kwiki::Notify::Mail
+#Kwiki::Archive::Cvs
+#Kwiki::LifeSearch
+#Kwiki::Cache
+

+ 13 - 47
kwiki/kwiki.spec

@@ -82,7 +82,7 @@ Class:        EVAL
 Group:        Web
 License:      GPL/Artistic
 Version:      %{V_kwiki}
-Release:      20050112
+Release:      20050113
 
 #   list of sources
 Source0:      http://www.cpan.org/authors/id/I/IN/INGY/Spoon-%{V_spoon}.tar.gz
@@ -132,6 +132,7 @@ Source43:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-Theme-Klassik-%{
 Source44:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-TimeZone-%{V_kwiki_timezone}.tar.gz
 Source45:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-Users-Remote-%{V_kwiki_users_remote}.tar.gz
 Source100:    kwiki-apache.conf
+Source101:    kwiki-plugins.txt
 Patch0:       kwiki.patch
 
 #   build information
@@ -492,6 +493,13 @@ AutoReqProv:  no
         %{SOURCE kwiki-apache.conf} \
         $RPM_BUILD_ROOT%{l_prefix}/etc/kwiki/
 
+    #   install default plugin list
+    %{l_shtool} mkdir -f -p -m 755 \
+        $RPM_BUILD_ROOT%{l_prefix}/share/kwiki
+    %{l_shtool} install -c -m 644 %{l_value -s -a} \
+        %{SOURCE kwiki-plugins.txt} \
+        $RPM_BUILD_ROOT%{l_prefix}/share/kwiki/plugins
+
     #   install Kwiki state directory
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/var/kwiki
@@ -521,52 +529,10 @@ AutoReqProv:  no
         ( cd $RPM_INSTALL_PREFIX/var/kwiki || exit $?
           echo "++ Generating new standard Kwiki in $RPM_INSTALL_PREFIX/var/kwiki"
           $RPM_INSTALL_PREFIX/bin/kwiki -new
-          echo "++ Installing additional plugins into Kwiki in $RPM_INSTALL_PREFIX/var/kwiki"
-          $RPM_INSTALL_PREFIX/bin/kwiki -add \
-              Kwiki::AnchorLink \
-              Kwiki::Archive::Rcs \
-              Kwiki::Autoformat \
-              Kwiki::Cache \
-              Kwiki::Revisions \
-              Kwiki::Diff \
-              Kwiki::RecentChanges \
-              Kwiki::RecentChangesRSS \
-              Kwiki::Search \
-              Kwiki::GDGraphGenerator \
-              Kwiki::GoogleLink \
-              Kwiki::Icons::Crystal \
-              Kwiki::Image \
-              Kwiki::NewPage \
-              Kwiki::Notify::Mail \
-              Kwiki::PageInclude \
-              Kwiki::ParagraphBlocks \
-              Kwiki::PreformattedBlocks \
-              Kwiki::ShellBlocks \
-              Kwiki::ShortcutLinks \
-              Kwiki::UserName \
-              Kwiki::UserPreferences \
-              Kwiki::AuthorOnlyPageEditing \
-              Kwiki::BreadCrumbs \
-              Kwiki::Comments \
-              Kwiki::GuestBook \
-              Kwiki::Favorites \
-              Kwiki::HtmlBlocks \
-              Kwiki::PodBlocks \
-              Kwiki::Scode \
-              Kwiki::Email \
-              Kwiki::TimeZone \
-              Kwiki::VimMode
-              #   List of intentionally left out plugins:
-              #   - Kwiki::PageTemplate
-              #   - Kwiki::MindMap
-              #   - Kwiki::Icons::Gnome
-              #   - Kwiki::Toolbar::List
-              #   - Kwiki::Archive::Cvs
-              #   - Kwiki::Edit::RequireUsername
-              #   - Kwiki::LifeSearch
-              #   - Kwiki::Formatter::Pod
-              #   - Kwiki::Theme::Klassik
-              #   - Kwiki::User::Remote
+          echo "++ Pre-configuring Kwiki in $RPM_INSTALL_PREFIX/var/kwiki"
+          cp $RPM_INSTALL_PREFIX/share/kwiki/plugins \
+             $RPM_INSTALL_PREFIX/var/kwiki/plugins
+          $RPM_INSTALL_PREFIX/bin/kwiki -update
           echo "++ Creating initial Apache password file $RPM_INSTALL_PREFIX/var/kwiki/passwd"
           $RPM_INSTALL_PREFIX/bin/htpasswd -b -c passwd admin admin
         ) || exit $?