bump up the Kwiki volume with more plugins and fix packaging

kwiki/kwiki.spec

@@ -24,35 +24,45 @@
 ##
 
 #   package versions
-%define       V_spoon                    0.20
-%define       V_kwiki                    0.36
-%define       V_kwiki_modperl            0.03
-%define       V_kwiki_anchorlink         0.02
-%define       V_kwiki_archive_rcs        0.13
-%define       V_kwiki_autoformat         0.02
-%define       V_kwiki_cache              0.11
-%define       V_kwiki_revisions          0.13
-%define       V_kwiki_diff               0.01
-%define       V_kwiki_recentchanges      0.12
-%define       V_kwiki_recentchangesrss   0.05
-%define       V_kwiki_search             0.12
-%define       V_kwiki_gdgraphgenerator   0.03
-%define       V_kwiki_googlelink         0.01
-%define       V_kwiki_icons_crystal      0.12
-%define       V_kwiki_icons_gnome        0.14
-%define       V_kwiki_image              0.01
-%define       V_kwiki_mindmap            0.08
-%define       V_kwiki_newpage            0.12
-%define       V_kwiki_notify_mail        0.02
-%define       V_kwiki_pageinclude        0.01
-%define       V_kwiki_paragraphblocks    0.12
-%define       V_kwiki_preformattedblocks 0.11
-%define       V_kwiki_shellblocks        0.02
-%define       V_kwiki_shortcutlinks      0.02
-%define       V_kwiki_toolbar_list       0.01
-%define       V_kwiki_username           0.13
-%define       V_kwiki_userpreferences    0.12
-%define       V_kwiki_vimmode            0.04
+%define       V_spoon                       0.20
+%define       V_kwiki                       0.36
+%define       V_kwiki_modperl               0.03
+%define       V_kwiki_anchorlink            0.02
+%define       V_kwiki_archive_rcs           0.13
+%define       V_kwiki_archive_cvs           0.102
+%define       V_kwiki_autoformat            0.02
+%define       V_kwiki_cache                 0.11
+%define       V_kwiki_revisions             0.13
+%define       V_kwiki_diff                  0.01
+%define       V_kwiki_recentchanges         0.12
+%define       V_kwiki_recentchangesrss      0.05
+%define       V_kwiki_search                0.12
+%define       V_kwiki_gdgraphgenerator      0.03
+%define       V_kwiki_googlelink            0.01
+%define       V_kwiki_icons_crystal         0.12
+%define       V_kwiki_icons_gnome           0.14
+%define       V_kwiki_image                 0.01
+%define       V_kwiki_mindmap               0.08
+%define       V_kwiki_newpage               0.12
+%define       V_kwiki_notify_mail           0.02
+%define       V_kwiki_pageinclude           0.01
+%define       V_kwiki_paragraphblocks       0.12
+%define       V_kwiki_preformattedblocks    0.11
+%define       V_kwiki_shellblocks           0.02
+%define       V_kwiki_shortcutlinks         0.02
+%define       V_kwiki_toolbar_list          0.01
+%define       V_kwiki_username              0.13
+%define       V_kwiki_userpreferences       0.12
+%define       V_kwiki_vimmode               0.04
+%define       V_kwiki_authoronlypageediting 0.01
+%define       V_kwiki_breadcrumbs           0.11
+%define       V_kwiki_comments              0.06
+%define       V_kwiki_edit_requireusername  0.01
+%define       V_kwiki_favorites             0.12
+%define       V_kwiki_guestbook             0.12
+%define       V_kwiki_htmlblocks            0.11
+%define       V_kwiki_livesearch            0.05
+%define       V_kwiki_pagetemplate          0.03
 
 #   package information
 Name:         kwiki
@@ -65,7 +75,7 @@ Class:        EVAL
 Group:        Web
 License:      GPL/Artistic
 Version:      %{V_kwiki}
-Release:      20041218
+Release:      20050111
 
 #   list of sources
 Source0:      http://www.cpan.org/authors/id/I/IN/INGY/Spoon-%{V_spoon}.tar.gz
@@ -97,6 +107,16 @@ Source25:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-Toolbar-List-%{V
 Source26:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-UserName-%{V_kwiki_username}.tar.gz
 Source27:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-UserPreferences-%{V_kwiki_userpreferences}.tar.gz
 Source28:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-VimMode-%{V_kwiki_vimmode}.tar.gz
+Source29:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-Archive-Cvs-%{V_kwiki_archive_cvs}.tar.gz
+Source30:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-AuthorOnlyPageEditing-%{V_kwiki_authoronlypageediting}.tar.gz
+Source31:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-BreadCrumbs-%{V_kwiki_breadcrumbs}.tar.gz
+Source32:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-Comments-%{V_kwiki_comments}.tar.gz
+Source33:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-Edit-RequireUserName-%{V_kwiki_edit_requireusername}.tar.gz
+Source34:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-Favorites-%{V_kwiki_favorites}.tar.gz
+Source35:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-GuestBook-%{V_kwiki_guestbook}.tar.gz
+Source36:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-HtmlBlocks-%{V_kwiki_htmlblocks}.tar.gz
+Source37:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-LiveSearch-%{V_kwiki_livesearch}.tar.gz
+Source38:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-PageTemplate-%{V_kwiki_pagetemplate}.tar.gz
 Source100:    kwiki-apache.conf
 
 #   build information
@@ -135,6 +155,11 @@ AutoReqProv:  no
         url       = http://www.cpan.org/modules/by-module/Kwiki/
         regex     = Kwiki-Archive-Rcs-(__VER__)\.tar\.gz
     }
+    prog kwiki:Kwiki-Archive-Cvs = {
+        version   = %{V_kwiki_archive_cvs}
+        url       = http://www.cpan.org/modules/by-module/Kwiki/
+        regex     = Kwiki-Archive-Cvs-(__VER__)\.tar\.gz
+    }
     prog kwiki:Kwiki-Autoformat = {
         version   = %{V_kwiki_autoformat}
         url       = http://www.cpan.org/modules/by-module/Kwiki/
@@ -260,6 +285,51 @@ AutoReqProv:  no
         url       = http://www.cpan.org/modules/by-module/Kwiki/
         regex     = Kwiki-VimMode-(__VER__)\.tar\.gz
     }
+    prog kwiki:Kwiki-AuthorOnlyPageEditing = {
+        version   = %{V_kwiki_authoronlypageediting}
+        url       = http://www.cpan.org/modules/by-module/Kwiki/
+        regex     = Kwiki-AuthorOnlyPageEditing-(__VER__)\.tar\.gz
+    }
+    prog kwiki:Kwiki-BreadCrumbs = {
+        version   = %{V_kwiki_breadcrumbs}
+        url       = http://www.cpan.org/modules/by-module/Kwiki/
+        regex     = Kwiki-BreadCrumbs-(__VER__)\.tar\.gz
+    }
+    prog kwiki:Kwiki-Comments = {
+        version   = %{V_kwiki_comments}
+        url       = http://www.cpan.org/modules/by-module/Kwiki/
+        regex     = Kwiki-Comments-(__VER__)\.tar\.gz
+    }
+    prog kwiki:Kwiki-Edit-RequireUserName = {
+        version   = %{V_kwiki_edit_requireusername}
+        url       = http://www.cpan.org/modules/by-module/Kwiki/
+        regex     = Kwiki-Edit-RequireUserName-(__VER__)\.tar\.gz
+    }
+    prog kwiki:Kwiki-Favorites = {
+        version   = %{V_kwiki_favorites}
+        url       = http://www.cpan.org/modules/by-module/Kwiki/
+        regex     = Kwiki-Favorites-(__VER__)\.tar\.gz
+    }
+    prog kwiki:Kwiki-GuestBook = {
+        version   = %{V_kwiki_guestbook}
+        url       = http://www.cpan.org/modules/by-module/Kwiki/
+        regex     = Kwiki-GuestBook-(__VER__)\.tar\.gz
+    }
+    prog kwiki:Kwiki-HtmlBlocks = {
+        version   = %{V_kwiki_htmlblocks}
+        url       = http://www.cpan.org/modules/by-module/Kwiki/
+        regex     = Kwiki-HtmlBlocks-(__VER__)\.tar\.gz
+    }
+    prog kwiki:Kwiki-LiveSearch = {
+        version   = %{V_kwiki_livesearch}
+        url       = http://www.cpan.org/modules/by-module/Kwiki/
+        regex     = Kwiki-LiveSearch-(__VER__)\.tar\.gz
+    }
+    prog kwiki:Kwiki-PageTemplate = {
+        version   = %{V_kwiki_pagetemplate}
+        url       = http://www.cpan.org/modules/by-module/Kwiki/
+        regex     = Kwiki-PageTemplate-(__VER__)\.tar\.gz
+    }
 
 %prep
     %setup -q -c
@@ -291,6 +361,16 @@ AutoReqProv:  no
     %setup -q -T -D -a 26
     %setup -q -T -D -a 27
     %setup -q -T -D -a 28
+    %setup -q -T -D -a 29
+    %setup -q -T -D -a 30
+    %setup -q -T -D -a 31
+    %setup -q -T -D -a 32
+    %setup -q -T -D -a 33
+    %setup -q -T -D -a 34
+    %setup -q -T -D -a 35
+    %setup -q -T -D -a 36
+    %setup -q -T -D -a 37
+    %setup -q -T -D -a 38
 
 %build
 
@@ -328,6 +408,16 @@ AutoReqProv:  no
     %{l_prefix}/bin/perl-openpkg -d %{SOURCE26} configure build install
     %{l_prefix}/bin/perl-openpkg -d %{SOURCE27} configure build install
     %{l_prefix}/bin/perl-openpkg -d %{SOURCE28} configure build install
+    %{l_prefix}/bin/perl-openpkg -d %{SOURCE29} configure build install
+    %{l_prefix}/bin/perl-openpkg -d %{SOURCE30} configure build install
+    %{l_prefix}/bin/perl-openpkg -d %{SOURCE31} configure build install
+    %{l_prefix}/bin/perl-openpkg -d %{SOURCE32} configure build install
+    %{l_prefix}/bin/perl-openpkg -d %{SOURCE33} configure build install
+    %{l_prefix}/bin/perl-openpkg -d %{SOURCE34} configure build install
+    %{l_prefix}/bin/perl-openpkg -d %{SOURCE35} configure build install
+    %{l_prefix}/bin/perl-openpkg -d %{SOURCE36} configure build install
+    %{l_prefix}/bin/perl-openpkg -d %{SOURCE37} configure build install
+    %{l_prefix}/bin/perl-openpkg -d %{SOURCE38} configure build install
     %{l_prefix}/bin/perl-openpkg -F perl-openpkg-files fixate cleanup
 
     #   install Apache configuration
@@ -364,7 +454,9 @@ AutoReqProv:  no
 
         #   create initial Kwiki
         ( cd $RPM_INSTALL_PREFIX/var/kwiki || exit $?
+          echo "++ Generating new Kwiki in $RPM_INSTALL_PREFIX/var/kwiki"
           $RPM_INSTALL_PREFIX/bin/kwiki -new
+          echo "++ Installing plugins into Kwiki in $RPM_INSTALL_PREFIX/var/kwiki"
           $RPM_INSTALL_PREFIX/bin/kwiki -add \
               Kwiki::AnchorLink \
               Kwiki::Archive::Rcs \
@@ -378,7 +470,6 @@ AutoReqProv:  no
               Kwiki::GDGraphGenerator \
               Kwiki::GoogleLink \
               Kwiki::Icons::Crystal \
-              Kwiki::Icons::Gnome \
               Kwiki::Image \
               Kwiki::NewPage \
               Kwiki::Notify::Mail \
@@ -387,11 +478,23 @@ AutoReqProv:  no
               Kwiki::PreformattedBlocks \
               Kwiki::ShellBlocks \
               Kwiki::ShortcutLinks \
-              Kwiki::Toolbar::List \
               Kwiki::UserName \
-              Kwiki::UserPreferences
+              Kwiki::UserPreferences \
+              Kwiki::AuthorOnlyPageEditing \
+              Kwiki::BreadCrumbs \
+              Kwiki::Comments \
+              Kwiki::GuestBook \
+              Kwiki::Favorites \
+              Kwiki::HtmlBlocks
+              #   Kwiki::PageTemplate
               #   Kwiki::MindMap
               #   Kwiki::VimMode
+              #   Kwiki::Icons::Gnome
+              #   Kwiki::Toolbar::List
+              #   Kwiki::Archive::Cvs
+              #   Kwiki::Edit::RequireUsername
+              #   Kwiki::LifeSearch
+          echo "++ Creating initial Apache password file $RPM_INSTALL_PREFIX/var/kwiki/passwd"
           $RPM_INSTALL_PREFIX/bin/htpasswd -b -c passwd admin admin
         ) || exit $?
 
@@ -401,7 +504,7 @@ AutoReqProv:  no
         ) | %{l_rpmtool} msg -b -t notice
     fi
 
-%postun
+%preun
     if [ ".$1" = .0 ]; then
         #   remove hook from Apache configuration
         apacheconf="$RPM_INSTALL_PREFIX/etc/apache/apache.conf"