rpms/moin/devel moin-1.5.2-config.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 moin.spec, 1.5, 1.6 sources, 1.4, 1.5 moin-1.3.5-config.patch, 1.1, NONE

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/moin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7698

Modified Files:
	.cvsignore moin.spec sources 
Added Files:
	moin-1.5.2-config.patch 
Removed Files:
	moin-1.3.5-config.patch 
Log Message:
Update to 1.5.2.


moin-1.5.2-config.patch:

--- NEW FILE moin-1.5.2-config.patch ---
diff -Naupr moin-1.5.2.orig/MoinMoin/multiconfig.py moin-1.5.2/MoinMoin/multiconfig.py
--- moin-1.5.2.orig/MoinMoin/multiconfig.py	2006-02-04 13:31:37.000000000 +0100
+++ moin-1.5.2/MoinMoin/multiconfig.py	2006-02-06 11:45:22.000000000 +0100
@@ -353,13 +353,13 @@ class DefaultConfig:
                               'edit_on_doubleclick': 0,
                               'remember_last_visit': 0,
                               '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.5.2.orig/wiki/config/wikiconfig.py moin-1.5.2/wiki/config/wikiconfig.py
--- moin-1.5.2.orig/wiki/config/wikiconfig.py	2006-02-04 22:20:20.000000000 +0100
+++ moin-1.5.2/wiki/config/wikiconfig.py	2006-02-06 11:46:18.000000000 +0100
@@ -65,14 +65,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.
@@ -123,6 +123,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/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Aug 2005 07:35:18 -0000	1.4
+++ .cvsignore	6 Feb 2006 11:55:17 -0000	1.5
@@ -1 +1 @@
-moin-1.3.5.tar.gz
+moin-1.5.2.tar.gz


Index: moin.spec
===================================================================
RCS file: /cvs/extras/rpms/moin/devel/moin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- moin.spec	19 Dec 2005 09:14:40 -0000	1.5
+++ moin.spec	6 Feb 2006 11:55:17 -0000	1.6
@@ -1,13 +1,13 @@
 Summary: MoinMoin is a Python clone of WikiWiki
 Name:    moin
-Version: 1.3.5
-Release: 3%{?dist}
+Version: 1.5.2
+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
-Patch0:  moin-1.3.5-config.patch
+Patch0:  moin-1.5.2-config.patch
 Patch1:  moin-1.3.5-xml_newline.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
@@ -44,7 +44,7 @@
 
 %files
 %defattr(-,root,root,0755)
-%doc README README-rpm docs/CHANGES docs/INSTALL.html docs/UPDATE.html
+%doc README README-rpm docs/CHANGES* docs/INSTALL.html docs/README.migration
 %doc docs/licenses/
 %{_bindir}/*
 %{_prefix}/lib/python?.?/site-packages/MoinMoin/
@@ -52,6 +52,11 @@
 
 
 %changelog
+* Mon Feb  6 2006 Matthias Saou <http://freshrpms.net/> 1.5.2-1
+- Update to 1.5.2.
+- Update config patch.
+- Update %%doc files.
+
 * Sun Dec 18 2005 Tommy Reynolds <Tommy.Reynolds at MegaCoder.com> 1.3.5-3
 - Remove extraneous '\' from XML output, so that <screen>..</screen>
   does not generate '\' 'n' outside of any markup.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moin/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Aug 2005 07:35:18 -0000	1.4
+++ sources	6 Feb 2006 11:55:17 -0000	1.5
@@ -1 +1 @@
-7194abf16cd6fe24c046013ce3a7c13d  moin-1.3.5.tar.gz
+689ed7aa9619aa207398b996d68b4b87  moin-1.5.2.tar.gz


--- moin-1.3.5-config.patch DELETED ---