rpms/moin/devel moin-1.3-config.patch, NONE, 1.1 moin.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Matthias Saou (thias)
fedora-extras-commits at redhat.com
Fri Apr 22 14:03:03 UTC 2005
Author: thias
Update of /cvs/extras/rpms/moin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12124/devel
Modified Files:
.cvsignore sources
Added Files:
moin-1.3-config.patch moin.spec
Log Message:
auto-import moin-1.3.3-2 on branch devel from moin-1.3.3-2.src.rpm
moin-1.3-config.patch:
--- NEW FILE moin-1.3-config.patch ---
--- moin-1.3.3/MoinMoin/user.py.lr 2005-01-09 22:06:06.000000000 +0100
+++ moin-1.3.3/MoinMoin/user.py 2005-01-27 22:01:38.219520927 +0100
@@ -263,13 +263,13 @@
# 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:
--- moin-1.3.3/MoinMoin/multiconfig.py.lr 2005-01-22 15:37:20.000000000 +0100
+++ moin-1.3.3/MoinMoin/multiconfig.py 2005-01-27 22:02:10.030073108 +0100
@@ -150,7 +150,7 @@
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""
@@ -163,7 +163,7 @@
allow_xslt = 0
attachments = None # {'dir': path, 'url': url-prefix}
auth_http_enabled = 0
- bang_meta = 0
+ bang_meta = 1
backtick_meta = 1
caching_formats = ['text_html']
changed_time_fmt = '%H:%M'
@@ -180,7 +180,7 @@
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'''
--- moin-1.3.3/wiki/config/wikiconfig.py.lr 2005-01-23 17:37:55.000000000 +0100
+++ moin-1.3.3/wiki/config/wikiconfig.py 2005-01-27 22:01:38.221520836 +0100
@@ -54,14 +54,14 @@
# 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 @@
u'%(page_front_page)s',
u'RecentChanges',
u'FindPage',
+ u'SiteNavigation',
u'HelpContents',
]
--- /dev/null 2005-01-26 20:40:07.202037984 +0100
+++ moin-1.3.3/README.redhat 2005-01-27 22:01:38.221520836 +0100
@@ -0,0 +1,37 @@
+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".
--- NEW FILE moin.spec ---
Summary: MoinMoin is a Python clone of WikiWiki
Name: moin
Version: 1.3.3
Release: 2
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
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.
%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
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,0755)
%doc README README.redhat CHANGES COPYING INSTALL.html UPDATE.html
%{_bindir}/*
%{_libdir}/python?.?/site-packages/MoinMoin/
%{_datadir}/moin/
%changelog
* 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.
* Wed Dec 22 2004 Florian La Roche <Florian.LaRoche at redhat.de>
- 1.3.1
* Thu Dec 09 2004 Florian La Roche <Florian.LaRoche at redhat.de>
- 1.3.0
* Sun Nov 07 2004 Florian La Roche <Florian.LaRoche at redhat.de>
- 1.3beta4
* Fri Aug 06 2004 Florian La Roche <Florian.LaRoche at redhat.de>
- update to 1.2.3
* Wed May 19 2004 - Kai.Puolamaki at iki.fi
- Fix also directory permissions...
* Mon May 17 2004 - Kai.Puolamaki at iki.fi
- Fix file permissions
* Fri May 14 2004 - Kai.Puolamaki at iki.fi
- 1.2.1
- Home build
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Apr 2005 14:02:04 -0000 1.1
+++ .cvsignore 22 Apr 2005 14:03:01 -0000 1.2
@@ -0,0 +1 @@
+moin-1.3.3.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 Apr 2005 14:02:04 -0000 1.1
+++ sources 22 Apr 2005 14:03:01 -0000 1.2
@@ -0,0 +1 @@
+21ea942a180845115bf58fc6ed1d5479 moin-1.3.3.tar.gz
More information about the fedora-extras-commits
mailing list