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: 11-Nov-2006 15:29:50
Branch: HEAD Handle: 2006111114295000
Modified files:
openpkg-src/twiki twiki.spec
Log:
finally upgrade from the old 2004 snapshot to the latest release 4.0.5
Summary:
Revision Changes Path
1.15 +53 -29 openpkg-src/twiki/twiki.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/twiki/twiki.spec
============================================================================
$ cvs diff -u -r1.14 -r1.15 twiki.spec
--- openpkg-src/twiki/twiki.spec 13 Oct 2006 17:35:07 -0000 1.14
+++ openpkg-src/twiki/twiki.spec 11 Nov 2006 14:29:50 -0000 1.15
@@ -32,21 +32,21 @@
Class: EVAL
Group: CMS
License: GPL
-Version: 20041030
-Release: 20061013
+Version: 4.0.5
+Release: 20061111
# list of sources
-Source0: http://TWikiGuest:[EMAIL
PROTECTED]/release/TWiki%{version}beta.zip
+Source0: http://twiki.org/p/pub/Codev/Release/TWiki-%{version}.tgz
Source1: twiki-apache.conf
Source2: rc.twiki
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20060823, infozip, perl
+BuildPreReq: OpenPKG, openpkg >= 20060823, perl
PreReq: OpenPKG, openpkg >= 20060823
-PreReq: perl, perl-net, perl-mail, perl-crypto
-PreReq: rcs, diffutils, grep
+PreReq: perl, perl-www, perl-net, perl-mail, perl-crypto
+PreReq: rcs, patch, diffutils, grep
PreReq: apache, MTA
AutoReq: no
AutoReqProv: no
@@ -58,13 +58,12 @@
%track
prog twiki = {
version = %{version}
- url = http://TWikiGuest:[EMAIL
PROTECTED]/cgi-bin/view/Codev/TWikiBetaRelease
- regex = TWiki(__VER__)beta\.zip
+ url = http://twiki.org/cgi-bin/view/Codev/DownloadTWiki
+ regex = TWiki-(__VER__)\.tgz
}
%prep
- %setup -q -c -T
- %{l_prefix}/bin/unzip -x -q %{SOURCE0}
+ %setup -q -c
%build
@@ -78,37 +77,60 @@
$RPM_BUILD_ROOT%{l_prefix}/libexec/twiki \
$RPM_BUILD_ROOT%{l_prefix}/var/twiki
- # install TWiki CGIs
- # (set path to custom Perl and library path)
+ # install TWiki CGIs and configuration
%{l_shtool} install -c -m 755 \
-e 's;/usr/bin/perl;%{l_prefix}/bin/perl;g' \
- -e "s;'../lib';'%{l_prefix}/lib/twiki';g" \
+ -e "s;'\.\./lib';'%{l_prefix}/lib/twiki';g" \
bin/* $RPM_BUILD_ROOT%{l_prefix}/libexec/twiki/
+ ( cd bin && %{l_tar} cf - logos ) | \
+ ( cd $RPM_BUILD_ROOT%{l_prefix}/libexec/twiki && %{l_tar} xf - ) || exit
$?
+ %{l_shtool} install -c -m 644 \
+ -e 's;/absolute/path/to/your/lib;%{l_prefix}/lib/twiki;g' \
+ -e 's;^# \(@localPerlLibPath = (
.\)/path/to/dir;\1%{l_prefix}/lib/twiki;g' \
+ bin/LocalLib.cfg.txt \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/twiki/twiki-lib.cfg
+ ln $RPM_BUILD_ROOT%{l_prefix}/etc/twiki/twiki-lib.cfg \
+ $RPM_BUILD_ROOT%{l_prefix}/libexec/twiki/LocalSite.cfg
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/libexec/twiki/LocalLib.cfg.txt
# install TWiki library and configuration
- # (move primary configuration file to canonical location and
pre-configure)
- %{l_shtool} install -c -m 644 \
- -e 's;http://your.domain.com;http://localhost;g' \
- -e 's;/home/httpd/twiki/pub;%{l_prefix}/var/twiki/pub;g' \
- -e 's;/home/httpd/twiki/templates;%{l_prefix}/etc/twiki/tmpl;g' \
- -e 's;/home/httpd/twiki/data;%{l_prefix}/var/twiki/data;g' \
+ %{l_shtool} subst \
-e 's;/usr/sbin/sendmail;%{l_prefix}/sbin/sendmail;g' \
-e "s;'/usr/bin';'%{l_prefix}/bin';g" \
+ -e "s;'/bin:/usr/bin';'%{l_prefix}/bin:/bin:/usr/bin';g" \
-e 's;/bin/egrep;%{l_prefix}/bin/egrep;g' \
-e 's;/bin/fgrep;%{l_prefix}/bin/fgrep;g' \
- lib/TWiki.cfg \
- $RPM_BUILD_ROOT%{l_prefix}/etc/twiki/twiki.conf
- rm -f lib/TWiki.cfg
+ lib/TWiki.cfg
( cd lib && %{l_tar} cf - . ) | \
( cd $RPM_BUILD_ROOT%{l_prefix}/lib/twiki && %{l_tar} xf - ) || exit $?
- ln $RPM_BUILD_ROOT%{l_prefix}/etc/twiki/twiki.conf \
- $RPM_BUILD_ROOT%{l_prefix}/lib/twiki/TWiki.cfg
+ %{l_shtool} install -c -m 644 \
+ -e 's;http://your\.domain\.com;http://localhost;g' \
+ -e 's;/home/httpd/twiki/pub;%{l_prefix}/var/twiki/pub;g' \
+ -e 's;/home/httpd/twiki/templates;%{l_prefix}/etc/twiki/tmpl;g' \
+ -e 's;/home/httpd/twiki/data;%{l_prefix}/var/twiki/data;g' \
+ -e '/^1;$/d' \
+ lib/LocalSite.cfg.txt \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/twiki/twiki-site.cfg
+ ( echo ""
+ echo "\$TWiki::cfg{LocalesDir} =
'%{l_prefix}/libexec/twiki/configurelocale';"
+ echo "\$TWiki::cfg{Password} = '0NQiQSaRf7IKo';"
+ echo "\$TWiki::cfg{Site}{Lang} = 'en';"
+ echo "\$TWiki::cfg{Site}{FullLang} = 'en-us';"
+ echo "\$TWiki::cfg{Site}{CharSet} = 'iso-8859-15';"
+ echo ""
+ echo "1;"
+ ) >>$RPM_BUILD_ROOT%{l_prefix}/etc/twiki/twiki-site.cfg
+ ln $RPM_BUILD_ROOT%{l_prefix}/etc/twiki/twiki-site.cfg \
+ $RPM_BUILD_ROOT%{l_prefix}/lib/twiki/LocalSite.cfg
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/twiki/LocalSite.cfg.txt
+ find $RPM_BUILD_ROOT%{l_prefix}/lib/twiki -type f -print | xargs chmod
664
+ find $RPM_BUILD_ROOT%{l_prefix}/lib/twiki -type d -print | xargs chmod
775
# install TWiki initial data
# (adjust RCS content for Apache run-time environment)
+ find data -name "*,v" -type f -print | xargs \
%{l_prefix}/bin/perl \
- -pi.orig -e 'NR <= 10 && s/nobody:/%{l_nusr}:/' \
- data/*/*,v
+ -pi.orig -e 'NR <= 10 && s/nobody:/%{l_nusr}:/'
find data -type f -name "*.orig" -print | xargs rm -f
find data -type f -print | xargs chmod 664
find data -type d -print | xargs chmod 775
@@ -141,7 +163,7 @@
# determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
- '%config %{l_prefix}/etc/twiki/twiki*' \
+ '%config %{l_prefix}/etc/twiki/twiki-*' \
'%config %{l_prefix}/etc/twiki/templates/*' \
'%attr(-,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/twiki'
@@ -163,8 +185,10 @@
# display information about steps the admin should perform next
( echo "TWiki was successfully installed. You should now start
Apache with"
echo " \$ $RPM_INSTALL_PREFIX/etc/rc apache start"
- echo "and then edit the TWiki site-level preferences under:"
- echo " http://localhost/twiki/bin/view/TWiki/TWikiPreferences";
+ echo "and then edit the TWiki site-level preferences:"
+ echo " http://localhost/twiki/bin/view/TWiki/TWikiPreferences";
+ echo "The top-level TWiki page is:"
+ echo " http://localhost/twiki/bin/view";
) | %{l_rpmtool} msg -b -t notice
fi
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
