flush work of this evening

kwiki/kwiki-apache.conf

@@ -23,3 +23,11 @@ Alias /kwiki/ @l_prefix@/var/kwiki/
     </Files>
 </Directory>
 
+<IfModule mod_perl.c>
+    <Location /kwiki>
+        SetHandler  perl-script
+        PerlHandler +Kwiki::ModPerl
+        PerlSetVar  KwikiBaseDir @l_prefix@/var/kwiki
+    </Location>
+</IfModule>
+

kwiki/kwiki.spec

@@ -26,6 +26,7 @@
 #   package versions
 %define       V_spoon                    0.18
 %define       V_kwiki                    0.33
+%define       V_kwiki_modperl            0.03
 %define       V_kwiki_anchorlink         0.02
 %define       V_kwiki_archive_rcs        0.11
 %define       V_kwiki_autoformat         0.02
@@ -35,14 +36,12 @@
 %define       V_kwiki_recentchanges      0.11
 %define       V_kwiki_recentchangesrss   0.04
 %define       V_kwiki_search             0.11
-%define       V_kwiki_formatter_pod      0.10
 %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_modperl            0.03
 %define       V_kwiki_newpage            0.11
 %define       V_kwiki_notify_mail        0.02
 %define       V_kwiki_pageinclude        0.01
@@ -80,25 +79,24 @@ Source7:      http://www.cpan.org/modules/by-module/Kwiki/Kwiki-Diff-%{V_kwiki_d
 Source8:      http://www.cpan.org/modules/by-module/Kwiki/Kwiki-RecentChanges-%{V_kwiki_recentchanges}.tar.gz
 Source9:      http://www.cpan.org/modules/by-module/Kwiki/Kwiki-RecentChangesRSS-%{V_kwiki_recentchangesrss}.tar.gz
 Source10:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-Search-%{V_kwiki_search}.tar.gz
-Source11:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-Formatter-Pod-%{V_kwiki_formatter_pod}.tar.gz
-Source12:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-GDGraphGenerator-%{V_kwiki_gdgraphgenerator}.tar.gz
-Source13:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-GoogleLink-%{V_kwiki_googlelink}.tar.gz
-Source14:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-Icons-Crystal-%{V_kwiki_icons_crystal}.tar.gz
-Source15:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-Icons-Gnome-%{V_kwiki_icons_gnome}.tar.gz
-Source16:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-Image-%{V_kwiki_image}.tar.gz
-Source17:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-MindMap-%{V_kwiki_mindmap}.tar.gz
-Source18:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-ModPerl-%{V_kwiki_modperl}.tar.gz
-Source19:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-NewPage-%{V_kwiki_newpage}.tar.gz
-Source20:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-Notify-Mail-%{V_kwiki_notify_mail}.tar.gz
-Source21:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-PageInclude-%{V_kwiki_pageinclude}.tar.gz
-Source22:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-ParagraphBlocks-%{V_kwiki_paragraphblocks}.tar.gz
-Source23:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-PreformattedBlocks-%{V_kwiki_preformattedblocks}.tar.gz
-Source24:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-ShellBlocks-%{V_kwiki_shellblocks}.tar.gz
-Source25:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-ShortcutLinks-%{V_kwiki_shortcutlinks}.tar.gz
-Source26:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-Toolbar-List-%{V_kwiki_toolbar_list}.tar.gz
-Source27:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-UserName-%{V_kwiki_username}.tar.gz
-Source28:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-UserPreferences-%{V_kwiki_userpreferences}.tar.gz
-Source29:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-VimMode-%{V_kwiki_vimmode}.tar.gz
+Source11:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-GDGraphGenerator-%{V_kwiki_gdgraphgenerator}.tar.gz
+Source12:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-GoogleLink-%{V_kwiki_googlelink}.tar.gz
+Source13:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-Icons-Crystal-%{V_kwiki_icons_crystal}.tar.gz
+Source14:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-Icons-Gnome-%{V_kwiki_icons_gnome}.tar.gz
+Source15:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-Image-%{V_kwiki_image}.tar.gz
+Source16:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-MindMap-%{V_kwiki_mindmap}.tar.gz
+Source17:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-ModPerl-%{V_kwiki_modperl}.tar.gz
+Source18:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-NewPage-%{V_kwiki_newpage}.tar.gz
+Source19:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-Notify-Mail-%{V_kwiki_notify_mail}.tar.gz
+Source20:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-PageInclude-%{V_kwiki_pageinclude}.tar.gz
+Source21:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-ParagraphBlocks-%{V_kwiki_paragraphblocks}.tar.gz
+Source22:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-PreformattedBlocks-%{V_kwiki_preformattedblocks}.tar.gz
+Source23:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-ShellBlocks-%{V_kwiki_shellblocks}.tar.gz
+Source24:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-ShortcutLinks-%{V_kwiki_shortcutlinks}.tar.gz
+Source25:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-Toolbar-List-%{V_kwiki_toolbar_list}.tar.gz
+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
 Source100:    kwiki-apache.conf
 
 #   build information
@@ -106,8 +104,8 @@ Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
 BuildPreReq:  OpenPKG, openpkg >= 20040130, perl, perl-openpkg
 PreReq:       OpenPKG, openpkg >= 20040130, perl, apache
-BuildPreReq:  perl-sys, perl-parse, perl-text, perl-mail
-PreReq:       perl-sys, perl-parse, perl-text, perl-mail
+BuildPreReq:  perl-sys, perl-parse, perl-text, perl-mail, perl-vcs, perl-gd
+PreReq:       perl-sys, perl-parse, perl-text, perl-mail, perl-vcs, perl-gd
 AutoReq:      no
 AutoReqProv:  no
 
@@ -147,6 +145,7 @@ AutoReqProv:  no
         url       = http://www.cpan.org/modules/by-module/Kwiki/
         regex     = Kwiki-Cache-(__VER__)\.tar\.gz
     }
+    #   FIXME
 
 %prep
     %setup -q -c
@@ -178,7 +177,6 @@ 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
 
 %build
 
@@ -216,7 +214,6 @@ 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 -F perl-openpkg-files fixate cleanup
 
     #   install Apache configuration
@@ -255,21 +252,32 @@ AutoReqProv:  no
         ( cd $RPM_INSTALL_PREFIX/var/kwiki || exit $?
           $RPM_INSTALL_PREFIX/bin/kwiki -new
           $RPM_INSTALL_PREFIX/bin/kwiki -add \
-              Kwiki::AnchorLink Kwiki::Archive Kwiki::Archive::Rcs Kwiki::Autoformat \
-              Kwiki::Base Kwiki::CGI Kwiki::CSS Kwiki::Cache Kwiki::Command \
-              Kwiki::Config Kwiki::ContentObject Kwiki::Cookie Kwiki::Diff \
-              Kwiki::Display Kwiki::Edit Kwiki::Files Kwiki::Formatter \
-              Kwiki::Formatter::Pod Kwiki::GDGraphGenerator Kwiki::GoogleLink \
-              Kwiki::Htaccess Kwiki::Hub Kwiki::Icons Kwiki::Icons::Crystal \
-              Kwiki::Icons::Gnome Kwiki::Image Kwiki::Installer Kwiki::Javascript \
-              Kwiki::MindMap Kwiki::ModPerl Kwiki::NewPage Kwiki::Notify::Mail \
-              Kwiki::PageInclude Kwiki::Pages Kwiki::ParagraphBlocks Kwiki::Plugin \
-              Kwiki::Preferences Kwiki::PreformattedBlocks Kwiki::RecentChanges \
-              Kwiki::RecentChangesRSS Kwiki::Registry Kwiki::Revisions Kwiki::Search \
-              Kwiki::ShellBlocks Kwiki::ShortcutLinks Kwiki::Status Kwiki::Template \
-              Kwiki::Template::TT2 Kwiki::Theme Kwiki::Theme::Basic Kwiki::Toolbar \
-              Kwiki::Toolbar::List Kwiki::UserName Kwiki::UserPreferences \
-              Kwiki::Users Kwiki::VimMode Kwiki::Widgets
+              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::Icons::Gnome \
+              Kwiki::Image \
+              Kwiki::NewPage \
+              Kwiki::Notify::Mail \
+              Kwiki::PageInclude \
+              Kwiki::ParagraphBlocks \
+              Kwiki::PreformattedBlocks \
+              Kwiki::ShellBlocks \
+              Kwiki::ShortcutLinks \
+              Kwiki::Toolbar::List \
+              Kwiki::UserName \
+              Kwiki::UserPreferences
+              #   Kwiki::MindMap
+              #   Kwiki::VimMode
           $RPM_INSTALL_PREFIX/bin/htpasswd -b -c passwd admin admin
         ) || exit $?
 
@@ -287,5 +295,9 @@ AutoReqProv:  no
             $RPM_INSTALL_PREFIX/lib/openpkg/rpmtool config \
                 -r -i "$RPM_INSTALL_PREFIX:kwiki" $apacheconf
         fi
+
+        #   remove Kwiki files
+        rm -rf $RPM_INSTALL_PREFIX/var/kwiki/.[a-z]* 2>/dev/null || true
+        rm -rf $RPM_INSTALL_PREFIX/var/kwiki/*       2>/dev/null || true
     fi