rpms/moin/FC-4 README-rpm, NONE, 1.1 moin-1.3.4-config.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 moin.spec, 1.1, 1.2 sources, 1.2, 1.3 moin-1.3-config.patch, 1.1, NONE

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/moin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32267/FC-4

Modified Files:
	.cvsignore moin.spec sources 
Added Files:
	README-rpm moin-1.3.4-config.patch 
Removed Files:
	moin-1.3-config.patch 
Log Message:
Update MoinMoin to 1.3.4, split custom README out from the patch.



--- NEW FILE README-rpm ---
Steps to setup moin for your apache server:

#!/bin/sh
DESTDIR=/var/www/mywiki
mkdir -p $DESTDIR/cgi-bin
cp -a /usr/share/moin/{data,underlay} $DESTDIR
cp -a /usr/share/moin/server/moin.cgi $DESTDIR/cgi-bin
cp -a /usr/share/moin/config/wikiconfig.py $DESTDIR/cgi-bin
chown -R apache.apache $DESTDIR/{data,underlay}
cat > /etc/httpd/conf.d/mywiki.conf <<EOF
ScriptAlias /mywiki "$DESTDIR/cgi-bin/moin.cgi"
<Directory "$DESTDIR/cgi-bin/">
    Options Indexes FollowSymLinks ExecCGI
    AllowOverride None
    Order allow,deny
    Allow from all
</Directory>
# To use mod_pyton disable all above, enable the following lines and
# also change wikiconfig.py to have absolute paths for data/underlay dirs.
#<Location /mywiki>
#    SetHandler python-program
#    PythonPath "['$DESTDIR/cgi-bin'] + sys.path"
#    PythonHandler MoinMoin.request::RequestModPy.run
#</Location>
Alias /wiki/ "/usr/share/moin/htdocs/"
<Directory "/usr/share/moin/htdocs/">
    Options Indexes FollowSymLinks
    AllowOverride None
    Order allow,deny
    Allow from all
</Directory>
EOF


Then edit /etc/httpd/conf/httpd.conf to include "AddHandler cgi-script .cgi"
and edit /var/www/mywiki/cgi-bin/wikiconfig.py and finally do
a "service httpd restart".


moin-1.3.4-config.patch:

--- NEW FILE moin-1.3.4-config.patch ---
diff -Naupr moin-1.3.4.orig/MoinMoin/multiconfig.py moin-1.3.4/MoinMoin/multiconfig.py
--- moin-1.3.4.orig/MoinMoin/multiconfig.py	2005-03-12 22:26:14.000000000 +0100
+++ moin-1.3.4/MoinMoin/multiconfig.py	2005-06-15 12:35:38.000000000 +0200
@@ -150,7 +150,7 @@ class DefaultConfig:
 
     FIXME: update according to MoinMoin:UpdateConfiguration
     """    
-    acl_enabled = 0
+    acl_enabled = 1
     # All acl_right lines must use unicode!
     acl_rights_default = u"Trusted:read,write,delete,revert Known:read,write,delete,revert All:read,write"
     acl_rights_before = u""
@@ -164,7 +164,7 @@ class DefaultConfig:
     attachments = None # {'dir': path, 'url': url-prefix}
     auth_http_enabled = 0
     auth_http_insecure = 0
-    bang_meta = 0
+    bang_meta = 1
     backtick_meta = 1
     caching_formats = ['text_html']
     changed_time_fmt = '%H:%M'
@@ -181,7 +181,7 @@ class DefaultConfig:
     default_lang = 'en'
     default_markup = 'wiki'
     edit_locking = 'warn 10' # None, 'warn <timeout mins>', 'lock <timeout mins>'
-    edit_rows = 30
+    edit_rows = 25
     hosts_deny = []
     html_head = ''
     html_head_queries = '''<meta name="robots" content="noindex,nofollow">\n'''
diff -Naupr moin-1.3.4.orig/MoinMoin/user.py moin-1.3.4/MoinMoin/user.py
--- moin-1.3.4.orig/MoinMoin/user.py	2005-03-06 23:15:42.000000000 +0100
+++ moin-1.3.4/MoinMoin/user.py	2005-06-15 12:34:52.000000000 +0200
@@ -264,13 +264,13 @@ class User:
         # create checkbox fields (with default 0)
         for key, label in self._checkbox_fields:
             setattr(self, key, 0)
-        self.show_page_trail = 1
+        self.show_page_trail = 0
         self.show_fancy_links = 1
         #self.show_emoticons = 1
         self.show_toolbar = 1
         self.show_nonexist_qm = self._cfg.nonexist_qm
         self.show_fancy_diff = 1
-        self.want_trivial = 0
+        self.want_trivial = 1
         self.remember_me = 1
 
         if not self.id and not self.auth_username:
diff -Naupr moin-1.3.4.orig/wiki/config/wikiconfig.py moin-1.3.4/wiki/config/wikiconfig.py
--- moin-1.3.4.orig/wiki/config/wikiconfig.py	2005-01-23 19:44:58.000000000 +0100
+++ moin-1.3.4/wiki/config/wikiconfig.py	2005-06-15 12:36:39.000000000 +0200
@@ -54,14 +54,14 @@ class Config(DefaultConfig):
 
     # Where your mutable wiki pages are. You want to make regular
     # backups of this directory.
-    data_dir = './data/'
+    data_dir = '../data/'
 
     # Where read-only system and help page are. You might want to share
     # this directory between several wikis. When you update MoinMoin,
     # you can safely replace the underlay directory with a new one. This
     # directory is part of MoinMoin distribution, you don't have to
     # backup it.
-    data_underlay_dir = './underlay/'
+    data_underlay_dir = '../underlay/'
 
     # This must be '/wiki' for twisted and standalone. For CGI, it should
     # match your Apache Alias setting.
@@ -115,6 +115,7 @@ class Config(DefaultConfig):
         u'%(page_front_page)s',
         u'RecentChanges',
         u'FindPage',
+        u'SiteNavigation',
         u'HelpContents',
     ]
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moin/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Apr 2005 14:03:01 -0000	1.2
+++ .cvsignore	15 Jun 2005 11:10:07 -0000	1.3
@@ -1 +1 @@
-moin-1.3.3.tar.gz
+moin-1.3.4.tar.gz


Index: moin.spec
===================================================================
RCS file: /cvs/extras/rpms/moin/FC-4/moin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- moin.spec	22 Apr 2005 14:03:01 -0000	1.1
+++ moin.spec	15 Jun 2005 11:10:07 -0000	1.2
@@ -1,44 +1,57 @@
 Summary: MoinMoin is a Python clone of WikiWiki
 Name:    moin
-Version: 1.3.3
-Release: 2
+Version: 1.3.4
+Release: 1%{?dist}
 License: GPL
 Group:   Applications/Internet
 URL:     http://moinmoin.wikiwikiweb.de/
-Source:  http://dl.sf.net/moin/moin-%{version}.tar.gz
-Patch:   moin-1.3-config.patch
+Source0: http://dl.sf.net/moin/moin-%{version}.tar.gz
+Source1: README-rpm
+Patch:   moin-1.3.4-config.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
 BuildRequires: python
 
 %description
-A WikiWikiWeb is a collaborative hypertext environment, with an
-emphasis on easy access to and modification of information. MoinMoin
-is a Python WikiClone that allows you to easily set up your own wiki,
-only requiring a Web server and a Python installation.
+A WikiWikiWeb is a collaborative hypertext environment, with an emphasis on
+easy access to and modification of information. MoinMoin is a Python
+WikiClone that allows you to easily set up your own wiki, only requiring a
+Web server and a Python installation.
+
 
 %prep
 %setup -q
 %patch -p1 -b .config
 
+
 %build
 %{__python} setup.py build
 
+
 %install
-rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install --root=$RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot} README-rpm
+%{__python} setup.py install --root=%{buildroot}
+%{__cp} -a %{SOURCE1} README-rpm
+
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
+
 
 %files
 %defattr(-,root,root,0755)
-%doc  README README.redhat CHANGES COPYING INSTALL.html UPDATE.html
+%doc  README README-rpm CHANGES COPYING INSTALL.html UPDATE.html
 %{_bindir}/*
 %{_libdir}/python?.?/site-packages/MoinMoin/
 %{_datadir}/moin/
 
+
 %changelog
+* Wed Jun 15 2005 Matthias Saou <http://freshrpms.net/> 1.3.4-1
+- Update to 1.3.4.
+- Update the config patch.
+- Move the README.redhat file out from the patch and rename it to README-rpm.
+
 * Tue Apr 19 2005 Matthias Saou <http://freshrpms.net/> 1.3.3-2
 - Adapted for inclusion into Extras.
 - Merge relevant bits from Jeff's pyvault version.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moin/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Apr 2005 14:03:01 -0000	1.2
+++ sources	15 Jun 2005 11:10:07 -0000	1.3
@@ -1 +1 @@
-21ea942a180845115bf58fc6ed1d5479  moin-1.3.3.tar.gz
+9d72e2cc6382d6dc8408bf0f9ccb1398  moin-1.3.4.tar.gz


--- moin-1.3-config.patch DELETED ---