[packages/moinmoin] Up to 1.9.11
arekm
arekm at pld-linux.org
Fri May 8 22:01:04 CEST 2026
commit 85b17eddfa8bf725e1936e923f7b196d295beeca
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Fri May 8 22:00:53 2026 +0200
Up to 1.9.11
moinmoin-config.patch | 157 +++++++++++++++++---------------------------------
moinmoin.spec | 31 +++++-----
2 files changed, 65 insertions(+), 123 deletions(-)
---
diff --git a/moinmoin.spec b/moinmoin.spec
index ff624ec..eb1845b 100644
--- a/moinmoin.spec
+++ b/moinmoin.spec
@@ -1,16 +1,13 @@
-# TODO
-# - for lighttpd: http://permalink.gmane.org/gmane.comp.web.lighttpd/3140
-# - http://moinmoin.wikiwikiweb.de/HelpOnInstalling/FastCgi
%define module moin
Summary: Wiki Engine
Summary(pl.UTF-8): Silnik Wiki
Name: moinmoin
-Version: 1.5.9
-Release: 2
-License: GPL
+Version: 1.9.11
+Release: 1
+License: GPL v2+
Group: Applications/WWW
Source0: http://static.moinmo.in/files/%{module}-%{version}.tar.gz
-# Source0-md5: 03025422c5addcbe9ccce3df2dde470c
+# Source0-md5: 61f5be129b7fe5e12ea0d9f3d41f53a2
Source1: %{name}-apache.conf
Source2: %{name}-httpd.conf
Patch0: %{name}-config.patch
@@ -48,12 +45,9 @@ modyfikowalnych stronach WWW.
rm -rf docs/licenses
rm -f wiki/data/user/README
-rm -f wiki/server/mointwisted.cmd
-rm -rf wiki/data/cache
# omit /usr/bin/env dep and let rpm autogenerate python binary dep
-%{__sed} -i -e '1s,^#!.*python,#!%{__python},' wiki/server/*
-mv wiki/server/moinmodpy.htaccess .
+%{__sed} -i -e '1s,^#!.*python,#!%{__python},' wiki/server/*
# prepare inclusion into %doc
mkdir -p config
@@ -63,7 +57,7 @@ mv wiki/config/{more_samples,wikifarm} config
%{__sed} -i -e 's,\r$,,' wiki/data/intermap.txt
%build
-python setup.py build
+%{__python} setup.py build
%install
rm -rf $RPM_BUILD_ROOT
@@ -71,8 +65,9 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir},/var/{cache,lib}/moin}
install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
-python setup.py install \
+%{__python} setup.py install \
--optimize=2 \
+ --prefix=%{_prefix} \
--root=$RPM_BUILD_ROOT
mv $RPM_BUILD_ROOT{%{_datadir}/moin/config/*.py,%{_sysconfdir}}
@@ -83,8 +78,8 @@ mv $RPM_BUILD_ROOT{%{_datadir}/moin/data,/var/lib/moin/data}
# it needs rw on underlay, so move it also to /var
mv $RPM_BUILD_ROOT{%{_datadir}/moin/underlay,/var/lib/moin/underlay}
-# create dirs / files it creates by on it's own
-install -d $RPM_BUILD_ROOT/var/lib/moin/data/cache/{i18n,surgeprotect,wikidicts}/__lock__
+# create dirs / files it creates on its own
+install -d $RPM_BUILD_ROOT/var/lib/moin/data/cache
touch $RPM_BUILD_ROOT/var/lib/moin/data/{event-log,error.log}
%clean
@@ -110,10 +105,11 @@ rm -rf $RPM_BUILD_ROOT
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf
%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.py
%attr(755,root,root) %{_bindir}/*
-%{py_sitescriptdir}/MoinMoin
+%{py_sitedir}/MoinMoin
+%{py_sitedir}/jabberbot
+%{py_sitedir}/moin-*.egg-info
%dir %{_datadir}/moin
%{_datadir}/moin/config
-%{_datadir}/moin/htdocs
%dir %{_datadir}/moin/server
%attr(755,root,root) %{_datadir}/moin/server/*
@@ -132,4 +128,3 @@ rm -rf $RPM_BUILD_ROOT
%ghost /var/lib/moin/data/error.log
/var/lib/moin/data/intermap.txt
/var/lib/moin/data/meta
-#/var/lib/moin/underlay/meta
diff --git a/moinmoin-config.patch b/moinmoin-config.patch
index 6b6f225..4efe84a 100644
--- a/moinmoin-config.patch
+++ b/moinmoin-config.patch
@@ -1,119 +1,66 @@
-diff -urN moin-1.5.4/wiki/config/wikiconfig.py moin-1.5.4.new/wiki/config/wikiconfig.py
---- moin-1.5.4/wiki/config/wikiconfig.py 2006-06-25 15:27:26.000000000 +0200
-+++ moin-1.5.4.new/wiki/config/wikiconfig.py 2006-07-10 23:53:23.245458500 +0200
-@@ -65,14 +65,14 @@
-
- # Where your mutable wiki pages are. You want to make regular
- # backups of this directory.
-- data_dir = './data/'
-+ data_dir = '/var/lib/moin/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 = '/var/lib/moin/underlay/'
-
- # Location of your STATIC files (css/png/js/...) - you must NOT use the
- # same for invoking moin.cgi (or, in general, the moin code).
-diff -urN moin-1.5.4/wiki/htdocs/index.html moin-1.5.4.new/wiki/htdocs/index.html
---- moin-1.5.4/wiki/htdocs/index.html 2006-05-11 18:24:01.000000000 +0200
-+++ moin-1.5.4.new/wiki/htdocs/index.html 2006-07-10 23:52:36.442533500 +0200
-@@ -1,11 +1,11 @@
- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
- <html>
- <head>
-- <meta http-equiv="refresh" content="0;URL=moin.cgi/">
-+ <meta http-equiv="refresh" content="0;URL=./">
- </head>
-
- <body bgcolor="#FFFFFF" text="#000000">
-- Click <a href="moin.cgi">here</a> to get to the FrontPage.
-+ Click <a href="./">here</a> to get to the FrontPage.
- </body>
- </html>
-
-diff -urN moin-1.5.4/wiki/server/moin moin-1.5.4.new/wiki/server/moin
---- moin-1.5.4/wiki/server/moin 2006-06-25 18:19:54.000000000 +0200
-+++ moin-1.5.4.new/wiki/server/moin 2006-07-10 23:46:23.495225750 +0200
-@@ -16,6 +16,7 @@
-
- # Add the path to moin.py directory
- ## sys.path.insert(0, '/path/to/moin')
-+sys.path.insert(0, '/usr/share/moin/server')
-
- from MoinMoin.server import daemon
- from moin import Config, run
-diff -urN moin-1.5.4/wiki/server/moin.cgi moin-1.5.4.new/wiki/server/moin.cgi
---- moin-1.5.4/wiki/server/moin.cgi 2006-06-25 15:31:27.000000000 +0200
-+++ moin-1.5.4.new/wiki/server/moin.cgi 2006-07-10 23:47:26.083137250 +0200
-@@ -17,7 +17,7 @@
-
- # Path of the directory where wikiconfig.py is located.
- # YOU NEED TO CHANGE THIS TO MATCH YOUR SETUP.
--sys.path.insert(0, '/path/to/wikiconfig')
+--- moin-1.9.11.orig/wiki/config/wikiconfig.py 2026-05-08 20:53:40.547450350 +0200
++++ moin-1.9.11/wiki/config/wikiconfig.py 2026-05-08 20:54:52.291861317 +0200
+@@ -45,7 +45,7 @@
+ # If that's not true, feel free to just set instance_dir to the real path
+ # where data/ and underlay/ is located:
+ #instance_dir = '/where/ever/your/instance/is'
+- instance_dir = wikiconfig_dir
++ instance_dir = '/var/lib/moin'
+
+ # Where your own wiki pages are (make regular backups of this directory):
+ data_dir = os.path.join(instance_dir, 'data', '') # path with trailing /
+--- moin-1.9.11.orig/wiki/server/moin.ajp 2026-05-08 20:53:40.547308787 +0200
++++ moin-1.9.11/wiki/server/moin.ajp 2026-05-08 20:54:10.309836599 +0200
+@@ -19,7 +19,7 @@
+
+ # a2) Path of the directory where wikiconfig.py / farmconfig.py is located.
+ # See wiki/config/... for some sample config files.
+-#sys.path.insert(0, '/path/to/wikiconfigdir')
+sys.path.insert(0, '/etc/webapps/moinmoin')
+ #sys.path.insert(0, '/path/to/farmconfigdir')
- # Path of the directory where farmconfig.py is located (if different).
- ## sys.path.insert(0, '/path/to/farmconfig')
-diff -urN moin-1.5.4/wiki/server/moin.fcg moin-1.5.4.new/wiki/server/moin.fcg
---- moin-1.5.4/wiki/server/moin.fcg 2006-06-25 15:31:52.000000000 +0200
-+++ moin-1.5.4.new/wiki/server/moin.fcg 2006-07-10 23:47:46.328402500 +0200
-@@ -17,7 +17,7 @@
+ # b) Configuration of moin's logging
+--- moin-1.9.11.orig/wiki/server/moin.cgi 2026-05-08 20:53:40.547407858 +0200
++++ moin-1.9.11/wiki/server/moin.cgi 2026-05-08 20:53:50.419836599 +0200
+@@ -21,7 +21,7 @@
- # Path of the directory where wikiconfig.py is located.
- # YOU NEED TO CHANGE THIS TO MATCH YOUR SETUP.
--sys.path.insert(0, '/path/to/wikiconfig')
+ # a2) Path of the directory where wikiconfig.py / farmconfig.py is located.
+ # See wiki/config/... for some sample config files.
+-#sys.path.insert(0, '/path/to/wikiconfigdir')
+sys.path.insert(0, '/etc/webapps/moinmoin')
+ #sys.path.insert(0, '/path/to/farmconfigdir')
- # Path of the directory where farmconfig is located (if different).
- ## sys.path.insert(0, '/path/to/farmconfig')
-diff -urN moin-1.5.4/wiki/server/moinmodpy.py moin-1.5.4.new/wiki/server/moinmodpy.py
---- moin-1.5.4/wiki/server/moinmodpy.py 2006-06-25 15:32:57.000000000 +0200
-+++ moin-1.5.4.new/wiki/server/moinmodpy.py 2006-07-10 23:49:12.673798750 +0200
-@@ -37,7 +37,7 @@
+ # b) Configuration of moin's logging
+--- moin-1.9.11.orig/wiki/server/moin.fcgi 2026-05-08 20:53:40.547384503 +0200
++++ moin-1.9.11/wiki/server/moin.fcgi 2026-05-08 20:53:54.756503266 +0200
+@@ -22,7 +22,7 @@
- # Path of the directory where wikiconfig.py is located.
- # YOU NEED TO CHANGE THIS TO MATCH YOUR SETUP.
--sys.path.insert(0, '/path/to/wikiconfig')
+ # a2) Path of the directory where wikiconfig.py / farmconfig.py is located.
+ # See wiki/config/... for some sample config files.
+-#sys.path.insert(0, '/path/to/wikiconfigdir')
+sys.path.insert(0, '/etc/webapps/moinmoin')
+ #sys.path.insert(0, '/path/to/farmconfigdir')
- # Path of the directory where farmconfig is located (if different).
- ## sys.path.insert(0, '/path/to/farmconfig')
-diff -urN moin-1.5.4/wiki/server/moin.py moin-1.5.4.new/wiki/server/moin.py
---- moin-1.5.4/wiki/server/moin.py 2006-06-25 15:32:14.000000000 +0200
-+++ moin-1.5.4.new/wiki/server/moin.py 2006-07-10 23:48:03.413470250 +0200
-@@ -16,7 +16,7 @@
+ # b) Configuration of moin's logging
+--- moin-1.9.11.orig/wiki/server/moin.scgi 2026-05-08 20:53:40.547361510 +0200
++++ moin-1.9.11/wiki/server/moin.scgi 2026-05-08 20:54:07.309836599 +0200
+@@ -19,7 +19,7 @@
- # Path of the directory where wikiconfig.py is located.
- # YOU NEED TO CHANGE THIS TO MATCH YOUR SETUP.
--sys.path.insert(0, '/path/to/wikiconfig')
+ # a2) Path of the directory where wikiconfig.py / farmconfig.py is located.
+ # See wiki/config/... for some sample config files.
+-#sys.path.insert(0, '/path/to/wikiconfigdir')
+sys.path.insert(0, '/etc/webapps/moinmoin')
+ #sys.path.insert(0, '/path/to/farmconfigdir')
- # Path of the directory where farmconfig is located (if different).
- ## sys.path.insert(0, '/path/to/farmconfig')
-diff -urN moin-1.5.4/wiki/server/mointwisted moin-1.5.4.new/wiki/server/mointwisted
---- moin-1.5.4/wiki/server/mointwisted 2006-06-25 18:20:44.000000000 +0200
-+++ moin-1.5.4.new/wiki/server/mointwisted 2006-07-10 23:50:03.420970250 +0200
-@@ -13,6 +13,7 @@
-
- # Add the path to mointwisted.py directory
- ## sys.path.insert(0, '/path/to/mointwisted')
-+sys.path.insert(0, '/usr/share/moin/server')
-
- import os
-
-diff -urN moin-1.5.4/wiki/server/mointwisted.py moin-1.5.4.new/wiki/server/mointwisted.py
---- moin-1.5.4/wiki/server/mointwisted.py 2006-06-25 15:34:03.000000000 +0200
-+++ moin-1.5.4.new/wiki/server/mointwisted.py 2006-07-10 23:51:27.086199000 +0200
-@@ -18,7 +18,7 @@
+ # b) Configuration of moin's logging
+--- moin-1.9.11.orig/wiki/server/moin.wsgi 2026-05-08 20:53:40.547333364 +0200
++++ moin-1.9.11/wiki/server/moin.wsgi 2026-05-08 20:54:03.699836599 +0200
+@@ -29,7 +29,7 @@
- # Path of the directory where wikiconfig.py is located.
- # YOU NEED TO CHANGE THIS TO MATCH YOUR SETUP.
--sys.path.insert(0, '/path/to/wikiconfig')
+ # a2) Path of the directory where wikiconfig.py / farmconfig.py is located.
+ # See wiki/config/... for some sample config files.
+-#sys.path.insert(0, '/path/to/wikiconfigdir')
+sys.path.insert(0, '/etc/webapps/moinmoin')
+ #sys.path.insert(0, '/path/to/farmconfigdir')
- # Path to the directory where farmconfig is located (if different).
- ## sys.path.insert(0, '/path/to/farmconfig')
+ # b) Configuration of moin's logging
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/moinmoin.git/commitdiff/85b17eddfa8bf725e1936e923f7b196d295beeca
More information about the pld-cvs-commit
mailing list