OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 25-Apr-2005 08:34:04
Branch: HEAD Handle: 2005042507340301
Modified files:
openpkg-src/kwiki kwiki.patch kwiki.spec
Log:
upgrading package: kwiki 0.37 -> 0.38
Summary:
Revision Changes Path
1.17 +40 -51 openpkg-src/kwiki/kwiki.patch
1.44 +22 -11 openpkg-src/kwiki/kwiki.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/kwiki/kwiki.patch
============================================================================
$ cvs diff -u -r1.16 -r1.17 kwiki.patch
--- openpkg-src/kwiki/kwiki.patch 26 Feb 2005 08:12:55 -0000 1.16
+++ openpkg-src/kwiki/kwiki.patch 25 Apr 2005 06:34:03 -0000 1.17
@@ -1,7 +1,7 @@
-Index: Kwiki-0.37/lib/Kwiki/Command.pm
---- Kwiki-0.37/lib/Kwiki/Command.pm.orig 2005-01-11 11:16:11 +0100
-+++ Kwiki-0.37/lib/Kwiki/Command.pm 2005-01-31 13:31:59 +0100
-@@ -114,7 +114,7 @@
+Index: Kwiki-0.38/lib/Kwiki/Command.pm
+--- Kwiki-0.38/lib/Kwiki/Command.pm.orig 2005-04-03 12:50:54 +0200
++++ Kwiki-0.38/lib/Kwiki/Command.pm 2005-04-05 19:21:59 +0200
+@@ -112,7 +112,7 @@
next unless $self->is_kwiki_dir($dir);
$self->msg('Updating ', $dir->absolute->pathname, "\n");
$dir->chdir;
@@ -10,9 +10,9 @@
}
}
-Index: Kwiki-0.37/lib/Kwiki/Config.pm
---- Kwiki-0.37/lib/Kwiki/Config.pm.orig 2005-01-11 16:51:34 +0100
-+++ Kwiki-0.37/lib/Kwiki/Config.pm 2005-01-31 13:31:59 +0100
+Index: Kwiki-0.38/lib/Kwiki/Config.pm
+--- Kwiki-0.38/lib/Kwiki/Config.pm.orig 2005-03-25 07:44:44 +0100
++++ Kwiki-0.38/lib/Kwiki/Config.pm 2005-04-05 19:21:59 +0200
@@ -174,11 +174,11 @@
# Put overrides in the top level config.yaml
# See: http://www.kwiki.org/?ChangingConfigDotYaml
@@ -27,10 +27,10 @@
__!config.yaml__
# Put all local overrides/modifications to the config/* files in this
# file. Do not modify any of the files under the config/ directory as
-Index: Kwiki-0.37/lib/Kwiki/Display.pm
---- Kwiki-0.37/lib/Kwiki/Display.pm.orig 2005-01-11 11:16:46 +0100
-+++ Kwiki-0.37/lib/Kwiki/Display.pm 2005-01-31 13:31:59 +0100
-@@ -84,7 +84,7 @@
+Index: Kwiki-0.38/lib/Kwiki/Display.pm
+--- Kwiki-0.38/lib/Kwiki/Display.pm.orig 2005-02-24 17:07:18 +0100
++++ Kwiki-0.38/lib/Kwiki/Display.pm 2005-04-05 19:21:59 +0200
+@@ -86,7 +86,7 @@
__template/tt2/display_changed_by.html__
[% IF self.preferences.display_changed_by.value %]
[% page = hub.pages.current %]
@@ -39,10 +39,10 @@
<em>
Last changed by [% page.edit_by_link %] at [% page.edit_time %]
</em>
-Index: Kwiki-0.37/lib/Kwiki/Formatter.pm
---- Kwiki-0.37/lib/Kwiki/Formatter.pm.orig 2005-01-11 11:16:46 +0100
-+++ Kwiki-0.37/lib/Kwiki/Formatter.pm 2005-01-31 13:31:59 +0100
-@@ -322,7 +322,7 @@
+Index: Kwiki-0.38/lib/Kwiki/Formatter.pm
+--- Kwiki-0.38/lib/Kwiki/Formatter.pm.orig 2005-03-20 07:55:13 +0100
++++ Kwiki-0.38/lib/Kwiki/Formatter.pm 2005-04-05 19:21:59 +0200
+@@ -345,7 +345,7 @@
package Kwiki::Formatter::HyperLink;
use base 'Spoon::Formatter::Unit';
const formatter_id => 'hyper';
@@ -51,7 +51,7 @@
const pattern_start => qr/$pattern|!$pattern/;
sub html {
-@@ -338,7 +338,7 @@
+@@ -361,7 +361,7 @@
use base 'Spoon::Formatter::Unit';
const formatter_id => 'titlehyper';
const pattern_start =>
@@ -60,10 +60,10 @@
sub html {
my $text = $self->escape_html($self->matched);
-Index: Kwiki-0.37/lib/Kwiki/Pages.pm
---- Kwiki-0.37/lib/Kwiki/Pages.pm.orig 2004-12-28 21:54:51 +0100
-+++ Kwiki-0.37/lib/Kwiki/Pages.pm 2005-01-31 13:31:59 +0100
-@@ -287,17 +287,17 @@
+Index: Kwiki-0.38/lib/Kwiki/Pages.pm
+--- Kwiki-0.38/lib/Kwiki/Pages.pm.orig 2005-03-17 22:15:31 +0100
++++ Kwiki-0.38/lib/Kwiki/Pages.pm 2005-04-05 19:21:59 +0200
+@@ -290,17 +290,17 @@
__!database/HomePage__
=== Welcome to Your New Kwiki!
@@ -91,29 +91,18 @@
+--[http://www.kwiki.org/?BrianIngerson Brian Ingerson] (Kwiki author) and
the [http://www.openpkg.org/ OpenPKG] team (Kwiki packaging).
---[http://www.kwiki.org/?BrianIngerson Brian Ingerson]
-Index: Kwiki-0.37/lib/Kwiki/Theme/Basic.pm
---- Kwiki-0.37/lib/Kwiki/Theme/Basic.pm.orig 2004-12-02 03:15:06 +0100
-+++ Kwiki-0.37/lib/Kwiki/Theme/Basic.pm 2005-01-31 13:31:59 +0100
-@@ -42,6 +42,8 @@
- </h1>
- </div>
-
+Index: Kwiki-0.38/lib/Kwiki/Theme/Basic.pm
+--- Kwiki-0.38/lib/Kwiki/Theme/Basic.pm.orig 2005-02-24 17:07:17 +0100
++++ Kwiki-0.38/lib/Kwiki/Theme/Basic.pm 2005-04-05 19:24:56 +0200
+@@ -36,6 +36,7 @@
+ <td id="group_1">
+ <div class="navigation">
+ [% INCLUDE theme_title_pane.html %]
+<p/>
-+
- <div id="toolbar_pane">
- [% hub.toolbar.html %]
- [% IF hub.have_plugin('user_name') %]
-@@ -76,6 +78,9 @@
-
- <div id="widgets_pane">
- [% hub.widgets.html %]
-+[% IF hub.have_plugin('infobox') %]
-+[% hub.infobox.html %]
-+[% END %]
+ [% INCLUDE theme_toolbar_pane.html %]
+ [% INCLUDE theme_status_pane.html %]
</div>
- </div><!-- navigation -->
-
-@@ -94,6 +99,9 @@
+@@ -71,6 +75,9 @@
#group {
width: 100%;
@@ -123,7 +112,7 @@
}
#group_1 {
-@@ -106,7 +114,9 @@
+@@ -83,7 +90,9 @@
}
body {
@@ -136,7 +125,7 @@
h1, h2, h3, h4, h5, h6 {
Index: Kwiki-Diff-0.02/lib/Kwiki/Diff.pm
--- Kwiki-Diff-0.02/lib/Kwiki/Diff.pm.orig 2005-01-30 15:44:26 +0100
-+++ Kwiki-Diff-0.02/lib/Kwiki/Diff.pm 2005-01-31 13:31:59 +0100
++++ Kwiki-Diff-0.02/lib/Kwiki/Diff.pm 2005-04-05 19:21:59 +0200
@@ -177,6 +177,11 @@
<img src="icons/gnome/image/diff.png" alt="Differences" />
<!-- END diff_button_icon.html -->
@@ -151,7 +140,7 @@
<a href="[% script_name %]?action=revisions&page_name=[% page_uri
%]&revision_id=[% revision_id %]" accesskey="r" title="Revision [% revision_id
%]">
Index: Kwiki-Favorites-0.13/lib/Kwiki/Favorites.pm
--- Kwiki-Favorites-0.13/lib/Kwiki/Favorites.pm.orig 2005-01-11 17:03:22
+0100
-+++ Kwiki-Favorites-0.13/lib/Kwiki/Favorites.pm 2005-01-31 13:31:59
+0100
++++ Kwiki-Favorites-0.13/lib/Kwiki/Favorites.pm 2005-04-05 19:21:59
+0200
@@ -111,7 +111,7 @@
}
</script>
@@ -163,7 +152,7 @@
</form>
Index: Kwiki-ForeignLinkGlyphs-0.01/lib/Kwiki/ForeignLinkGlyphs.pm
--- Kwiki-ForeignLinkGlyphs-0.01/lib/Kwiki/ForeignLinkGlyphs.pm.orig
2004-08-26 16:59:17 +0200
-+++ Kwiki-ForeignLinkGlyphs-0.01/lib/Kwiki/ForeignLinkGlyphs.pm
2005-01-31 13:31:59 +0100
++++ Kwiki-ForeignLinkGlyphs-0.01/lib/Kwiki/ForeignLinkGlyphs.pm
2005-04-05 19:21:59 +0200
@@ -108,6 +108,6 @@
Allow from all
@@ -176,7 +165,7 @@
+SGrkAAAAFElEQVQI12OwYZBhsGEoYUhgSAAACQQByefTiF8AAAAASUVORK5CYII=
Index: Kwiki-Notify-Mail-0.03/lib/Kwiki/Notify/Mail.pm
--- Kwiki-Notify-Mail-0.03/lib/Kwiki/Notify/Mail.pm.orig 2005-01-25
21:49:23 +0100
-+++ Kwiki-Notify-Mail-0.03/lib/Kwiki/Notify/Mail.pm 2005-01-31 13:31:59
+0100
++++ Kwiki-Notify-Mail-0.03/lib/Kwiki/Notify/Mail.pm 2005-04-05 19:21:59
+0200
@@ -66,7 +66,7 @@
$msg->print(\*TEMPFILE);
close TEMPFILE;
@@ -187,9 +176,9 @@
}
Index: Kwiki-RecentChangesRSS-0.06/lib/Kwiki/RecentChangesRSS.pm
---- Kwiki-RecentChangesRSS-0.06/lib/Kwiki/RecentChangesRSS.pm.orig
2004-12-11 22:50:42 +0100
-+++ Kwiki-RecentChangesRSS-0.06/lib/Kwiki/RecentChangesRSS.pm
2005-01-31 13:31:59 +0100
-@@ -312,6 +312,7 @@
+--- Kwiki-RecentChangesRSS-0.06/lib/Kwiki/RecentChangesRSS.pm.orig
2005-02-26 02:02:30 +0100
++++ Kwiki-RecentChangesRSS-0.06/lib/Kwiki/RecentChangesRSS.pm
2005-04-05 19:21:59 +0200
+@@ -311,6 +311,7 @@
rss_skipHours:
rss_skipDays:
rss_display_page: 0
@@ -197,7 +186,7 @@
__template/tt2/rss_button.html__
<!-- BEGIN rss_button.html -->
<a href="[% script_name %]?action=RecentChangesRSS" accesskey="c"
title="RSS">
-@@ -324,7 +325,7 @@
+@@ -323,7 +324,7 @@
<!-- END rss_button_icon.html -->
__template/tt2/rss_screen.xml__
[% xml %]
@@ -208,7 +197,7 @@
eNpjdDdgQAX/Gd9+QBP6w8SAAYBC/1YzcBdYr2eYvYG7ACTEAhQ98JVb9vRvBoG/DD+gqhga2Jmd
Index: Kwiki-Search-0.12/lib/Kwiki/Search.pm
--- Kwiki-Search-0.12/lib/Kwiki/Search.pm.orig 2004-12-16 00:38:12
+0100
-+++ Kwiki-Search-0.12/lib/Kwiki/Search.pm 2005-01-31 13:31:59 +0100
++++ Kwiki-Search-0.12/lib/Kwiki/Search.pm 2005-04-05 19:21:59 +0200
@@ -72,7 +72,7 @@
=cut
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/kwiki/kwiki.spec
============================================================================
$ cvs diff -u -r1.43 -r1.44 kwiki.spec
--- openpkg-src/kwiki/kwiki.spec 6 Apr 2005 17:48:14 -0000 1.43
+++ openpkg-src/kwiki/kwiki.spec 25 Apr 2005 06:34:04 -0000 1.44
@@ -22,17 +22,19 @@
## SUCH DAMAGE.
##
+# FIXME: rse: still some plugins are broken because they need porting to
Kwiki 0.38!!
+
# package versions
%define V_perl 5.8.6
-%define V_spoon 0.21
-%define V_kwiki 0.37
+%define V_spoon 0.23
+%define V_kwiki 0.38
%define V_kwiki_modperl 0.06
-%define V_kwiki_anchorlink 0.02
-%define V_kwiki_archive_rcs 0.14
+%define V_kwiki_anchorlink 0.03
+%define V_kwiki_archive_rcs 0.15
%define V_kwiki_archive_cvs 0.102
%define V_kwiki_autoformat 0.02
%define V_kwiki_cache 0.11
-%define V_kwiki_revisions 0.14
+%define V_kwiki_revisions 0.15
%define V_kwiki_diff 0.02
%define V_kwiki_recentchanges 0.13
%define V_kwiki_recentchangesrss 0.06
@@ -45,7 +47,7 @@
%define V_kwiki_mindmap 0.09
%define V_kwiki_newpage 0.12
%define V_kwiki_notify_mail 0.03
-%define V_kwiki_pageinclude 0.01
+%define V_kwiki_pageinclude 0.02
%define V_kwiki_paragraphblocks 0.12
%define V_kwiki_preformattedblocks 0.11
%define V_kwiki_shellblocks 0.02
@@ -61,7 +63,7 @@
%define V_kwiki_favorites 0.13
%define V_kwiki_guestbook 0.13
%define V_kwiki_htmlblocks 0.11
-%define V_kwiki_livesearch 0.06
+%define V_kwiki_livesearch 0.07
%define V_kwiki_pagetemplate 0.04
%define V_kwiki_email 0.02
%define V_kwiki_formatter_pod 0.11
@@ -73,11 +75,12 @@
%define V_kwiki_pageprivacy 0.10
%define V_kwiki_navigationtoolbar 0.02
%define V_kwiki_configblocks 0.01
-%define V_kwiki_infobox 0.02
+%define V_kwiki_infobox 0.03
%define V_kwiki_theme_columnlayout 0.08
%define V_kwiki_theme_hlb 0.01
%define V_kwiki_theme_tabnav 0.01
%define V_kwiki_theme_bluepole 1.00
+%define V_kwiki_theme_greenhouse 0.03
%define V_kwiki_foreignlinkglyphs 0.01
%define V_kwiki_backlinks 0.08
%define V_kwiki_fetchrss 0.07
@@ -87,10 +90,10 @@
%define V_kwiki_pagestats 0.01
%define V_kwiki_purple 0.02
%define V_kwiki_test 0.03
-%define V_kwiki_attachments 0.12
+%define V_kwiki_attachments 0.15
%define V_kwiki_opensearch 0.02
%define V_kwiki_urlblock 0.05
-%define V_kwiki_cacheddisplay 0.01
+%define V_kwiki_cacheddisplay 0.02
%define V_kwiki_footnote 0.01
%define V_kwiki_raw 0.01
%define V_kwiki_trackback 0.01
@@ -107,7 +110,7 @@
Group: Web
License: GPL/Artistic
Version: %{V_kwiki}
-Release: 20050406
+Release: 20050425
# list of sources
Source0:
http://www.cpan.org/authors/id/I/IN/INGY/Spoon-%{V_spoon}.tar.gz
@@ -181,6 +184,7 @@
Source68:
http://www.cpan.org/modules/by-module/Kwiki/Kwiki-Raw-%{V_kwiki_raw}.tar.gz
Source69:
http://www.cpan.org/modules/by-module/Kwiki/Kwiki-Trackback-%{V_kwiki_trackback}.tar.gz
Source70:
http://www.cpan.org/modules/by-module/Kwiki/Kwiki-TypeKey-%{V_kwiki_typekey}.tar.gz
+Source71:
http://www.cpan.org/modules/by-module/Kwiki/Kwiki-Theme-GreenHouse-%{V_kwiki_theme_greenhouse}.tar.gz
Source100: kwiki-apache.conf
Source101: kwiki-plugins.txt
Source102: kwiki-rules.wiki
@@ -494,6 +498,11 @@
url = http://www.cpan.org/modules/by-module/Kwiki/
regex = Kwiki-Theme-Bluepole-(__VER__)\.tar\.gz
}
+ prog kwiki:Kwiki-Theme-GreenHouse = {
+ version = %{V_kwiki_theme_greenhouse}
+ url = http://www.cpan.org/modules/by-module/Kwiki/
+ regex = Kwiki-Theme-GreenHouse-(__VER__)\.tar\.gz
+ }
prog kwiki:Kwiki-CoolURI = {
version = %{V_kwiki_cooluri}
url = http://www.cpan.org/modules/by-module/Kwiki/
@@ -637,6 +646,7 @@
%setup -q -T -D -a 68
%setup -q -T -D -a 69
%setup -q -T -D -a 70
+ %setup -q -T -D -a 71
sed <%{PATCH0} -e 's;@l_prefix@;%{l_prefix};g' | %{l_patch} -p0 -b
%build
@@ -718,6 +728,7 @@
%{l_prefix}/bin/perl-openpkg -d %{SOURCE68} configure build install
%{l_prefix}/bin/perl-openpkg -d %{SOURCE69} configure build install
%{l_prefix}/bin/perl-openpkg -d %{SOURCE70} configure build install
+ %{l_prefix}/bin/perl-openpkg -d %{SOURCE71} configure build install
# manually install OpenPKG Kwiki theme
mkdir Kwiki-Theme-OpenPKG
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
