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

Matthias Saou (thias) fedora-extras-commits at redhat.com
Tue Aug 16 13:48:29 UTC 2005


Author: thias

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

Modified Files:
	.cvsignore moin.spec sources 
Added Files:
	moin-1.3.5-config.patch 
Removed Files:
	moin-1.3.4-config.patch 
Log Message:
Update FC-4 banch to 1.3.5 too, as devel package works well and testing shows no breakage when upgrading from 1.3.4.


moin-1.3.5-config.patch:

--- NEW FILE moin-1.3.5-config.patch ---
diff -Naupr moin-1.3.5.orig/MoinMoin/multiconfig.py moin-1.3.5/MoinMoin/multiconfig.py
--- moin-1.3.5.orig/MoinMoin/multiconfig.py	2005-07-30 17:58:51.000000000 +0200
+++ moin-1.3.5/MoinMoin/multiconfig.py	2005-08-15 13:42:13.000000000 +0200
@@ -151,7 +151,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""
@@ -165,7 +165,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'
@@ -274,13 +274,13 @@ class DefaultConfig:
                               'remember_last_visit': 0,
                               'show_fancy_links':    1,
                               'show_nonexist_qm':    nonexist_qm,
-                              'show_page_trail':     1,
+                              'show_page_trail':     0,
                               'show_toolbar':        1,
                               'show_topbottom':      0,
                               'show_fancy_diff':     1,
                               'wikiname_add_spaces': 0,
                               'remember_me':         1,
-                              'want_trivial':        0,
+                              'want_trivial':        1,
                               }
     # don't let the user change those
     # user_checkbox_disable = ['disabled', 'want_trivial']
diff -Naupr moin-1.3.5.orig/wiki/config/wikiconfig.py moin-1.3.5/wiki/config/wikiconfig.py
--- moin-1.3.5.orig/wiki/config/wikiconfig.py	2005-06-26 17:43:05.000000000 +0200
+++ moin-1.3.5/wiki/config/wikiconfig.py	2005-08-15 13:43:18.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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Jun 2005 11:10:07 -0000	1.3
+++ .cvsignore	16 Aug 2005 13:48:27 -0000	1.4
@@ -1 +1 @@
-moin-1.3.4.tar.gz
+moin-1.3.5.tar.gz


Index: moin.spec
===================================================================
RCS file: /cvs/extras/rpms/moin/FC-4/moin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- moin.spec	15 Jun 2005 11:10:07 -0000	1.2
+++ moin.spec	16 Aug 2005 13:48:27 -0000	1.3
@@ -1,13 +1,13 @@
 Summary: MoinMoin is a Python clone of WikiWiki
 Name:    moin
-Version: 1.3.4
+Version: 1.3.5
 Release: 1%{?dist}
 License: GPL
 Group:   Applications/Internet
 URL:     http://moinmoin.wikiwikiweb.de/
 Source0: http://dl.sf.net/moin/moin-%{version}.tar.gz
 Source1: README-rpm
-Patch:   moin-1.3.4-config.patch
+Patch:   moin-1.3.5-config.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
 BuildRequires: python
@@ -40,13 +40,19 @@
 
 %files
 %defattr(-,root,root,0755)
-%doc  README README-rpm CHANGES COPYING INSTALL.html UPDATE.html
+%doc README README-rpm docs/CHANGES docs/INSTALL.html docs/UPDATE.html
+%doc docs/licenses/
 %{_bindir}/*
 %{_libdir}/python?.?/site-packages/MoinMoin/
 %{_datadir}/moin/
 
 
 %changelog
+* Mon Aug 15 2005 Matthias Saou <http://freshrpms.net/> 1.3.5-1
+- Update to 1.3.5.
+- Update the config patch.
+- Update %%doc section (many moved to docs/).
+
 * Wed Jun 15 2005 Matthias Saou <http://freshrpms.net/> 1.3.4-1
 - Update to 1.3.4.
 - Update the config patch.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moin/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Jun 2005 11:10:07 -0000	1.3
+++ sources	16 Aug 2005 13:48:27 -0000	1.4
@@ -1 +1 @@
-9d72e2cc6382d6dc8408bf0f9ccb1398  moin-1.3.4.tar.gz
+7194abf16cd6fe24c046013ce3a7c13d  moin-1.3.5.tar.gz


--- moin-1.3.4-config.patch DELETED ---




More information about the scm-commits mailing list