rpms/moin/FC-5 .cvsignore, 1.7, 1.8 moin.spec, 1.9, 1.10 sources, 1.7, 1.8 00821_SECURITY_FIX_use_ACL_in_include_directive.patch, 1.1, NONE 00825_SECURITY-fix_MonthCalendar_respect_ACLs.patch, 1.1, NONE 00829_SECURITY_FIX_XSS_in_AttachFile_do_parameter.patch, 1.1, NONE

[Matthias Saou (thias)]

Author: thias

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

Modified Files:
	.cvsignore moin.spec sources 
Removed Files:
	00821_SECURITY_FIX_use_ACL_in_include_directive.patch 
	00825_SECURITY-fix_MonthCalendar_respect_ACLs.patch 
	00829_SECURITY_FIX_XSS_in_AttachFile_do_parameter.patch 
Log Message:
Backport devel/F-7 1.5.8 to all current branches.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moin/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	12 Feb 2007 10:45:29 -0000	1.7
+++ .cvsignore	30 May 2007 14:12:22 -0000	1.8
@@ -1 +1 @@
-moin-1.5.7.tar.gz
+moin-1.5.8.tar.gz


Index: moin.spec
===================================================================
RCS file: /cvs/extras/rpms/moin/FC-5/moin.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- moin.spec	7 May 2007 12:59:07 -0000	1.9
+++ moin.spec	30 May 2007 14:12:22 -0000	1.10
@@ -1,21 +1,19 @@
+%define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
+
 Summary: MoinMoin is a Python clone of WikiWiki
-Name:    moin
-Version: 1.5.7
-Release: 2%{?dist}
+Name: moin
+Version: 1.5.8
+Release: 1%{?dist}
 License: GPL
-Group:   Applications/Internet
-URL:     http://moinmoin.wikiwikiweb.de/
+Group: Applications/Internet
+URL: http://moinmoin.wikiwikiweb.de/
 Source0: http://dl.sf.net/moin/moin-%{version}.tar.gz
 Source1: README-rpm
-Patch0:  moin-1.5.2-config.patch
-Patch1:  moin-1.3.5-xml_newline.patch
-# Security patches, mostly (all?) from the Debian package
-Patch10: 00821_SECURITY_FIX_use_ACL_in_include_directive.patch
-Patch11: 00825_SECURITY-fix_MonthCalendar_respect_ACLs.patch
-Patch12: 00829_SECURITY_FIX_XSS_in_AttachFile_do_parameter.patch
-Patch13: 10010_CVE-2007-0857.patch
+Patch0: moin-1.5.2-config.patch
+Patch1: moin-1.3.5-xml_newline.patch
+Patch10: 10010_CVE-2007-0857.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: python-devel, dos2unix
+BuildRequires: python-devel
 BuildArch: noarch
 
 %description
@@ -28,14 +26,8 @@
 %prep
 %setup -q
 %patch0 -p1 -b .config
-# This is required, as patch gets confused by the ^Ms otherwise
-dos2unix MoinMoin/formatter/xml_docbook.py
 %patch1 -p1 -b .xml_newline
-# Security fixes
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
+%patch10 -p1 -b .CVE-2007-0857
 
 
 %build
@@ -53,15 +45,20 @@
 
 
 %files
-%defattr(-,root,root,0755)
+%defattr(-,root,root,-)
 %doc README README-rpm docs/CHANGES* docs/INSTALL.html docs/README.migration
 %doc docs/licenses/
-%{_bindir}/*
-%{_prefix}/lib/python?.?/site-packages/MoinMoin/
+%{_bindir}/moin
+%{python_sitelib}/MoinMoin/
 %{_datadir}/moin/
 
 
 %changelog
+* Wed May 16 2007 Matthias Saou <http://freshrpms.net/> 1.5.8-1
+- Update to 1.5.8, which includes most previous security fixes.
+- Remove the (apparently) no longer needed dos2unix conversion for patch.
+- Use %%{python_sitelib} macro.
+
 * Mon May  7 2007 Matthias Saou <http://freshrpms.net/> 1.5.7-2
 - Include security fixes from the Debian package (Jonas Smedegaard).
 - FIX_use_ACL_in_include_directive (Alexander Schremmer).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moin/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	12 Feb 2007 10:45:29 -0000	1.7
+++ sources	30 May 2007 14:12:22 -0000	1.8
@@ -1 +1 @@
-b304f1c2054c7f3bf0dc48c141b28b33  moin-1.5.7.tar.gz
+79625eaeb65907bfaf8b3036d81c82a5  moin-1.5.8.tar.gz


--- 00821_SECURITY_FIX_use_ACL_in_include_directive.patch DELETED ---


--- 00825_SECURITY-fix_MonthCalendar_respect_ACLs.patch DELETED ---


--- 00829_SECURITY_FIX_XSS_in_AttachFile_do_parameter.patch DELETED ---