[mrepo/el5/master] Backed out the python 2.6 patch, fixed repoview

[James Findley]

commit 73add51ac250233b346917cf97a72a3cd5cad81d
Author: James Findley <jfindley at localhost.localdomain>
Date:   Wed Aug 4 10:57:17 2010 +0100

    Backed out the python 2.6 patch, fixed repoview

 mrepo-repoview_options.patch |   14 ++++++++++
 mrepo.spec                   |   57 ++++++++++++++++++++++--------------------
 2 files changed, 44 insertions(+), 27 deletions(-)
---
diff --git a/mrepo-repoview_options.patch b/mrepo-repoview_options.patch
new file mode 100644
index 0000000..f9c3de7
--- /dev/null
+++ b/mrepo-repoview_options.patch
@@ -0,0 +1,14 @@
+--- mrepo-0.8.7/mrepo	2010-08-04 10:37:52.490515767 +0100
++++ mrepo-0.8.7/mrepo.1	2010-08-04 10:37:44.955549668 +0100
+@@ -928,9 +928,9 @@
+             return
+         if not cf.cmd['repoview']:
+             return
+-        opts = ''
++        opts = ' ' + cf.repoviewoptions
+         if op.force:
+-            opts = ' --force'
++            opts = ' --force' + opts
+         if op.verbose <= 2:
+             opts = ' --quiet' + opts
+         if os.path.exists(self.wwwdir):
diff --git a/mrepo.spec b/mrepo.spec
index 94828ce..93faa5f 100644
--- a/mrepo.spec
+++ b/mrepo.spec
@@ -1,41 +1,41 @@
-Name:		mrepo
-Version:	0.8.7
-Release:	1%{?dist}
-Summary:	A tool to set up a yum/apt mirror from various sources
-License:	GPLv2
-Group:		System Environment/Base
-URL:		http://dag.wieers.com/home-made/mrepo/
+Name:       mrepo
+Version:    0.8.7
+Release:    2%{?dist}
+Summary:    A tool to set up a yum/apt mirror from various sources
+License:    GPLv2
+Group:      System Environment/Base
+URL:        http://dag.wieers.com/home-made/mrepo/
 # At time of writing, the latest stable release is not provided as a tarball
 #
 # svn export http://svn.rpmforge.net/svn/trunk/tools/mrepo/ mrepo-0.8.7
 # tar -cvjf mrepo-0.8.7.tar.bz2 mrepo-0.8.7
-Source0:	mrepo-%{version}.tar.bz2
+Source0:    mrepo-%{version}.tar.bz2
 # Patch initfile to conform to new standards
-Patch0:		mrepo-initd.patch
+Patch0:     mrepo-initd.patch
 # Patch to make mounting of ISOs possible with SELinux
-Patch1:		mrepo-selinux.patch
-# Patch to fix two deprecation warnings with Python 2.6
-Patch2:		mrepo-python26.patch
-BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildArch:	noarch
+Patch1:     mrepo-selinux.patch
+#Patch provided by Tom McLaughlin to fix repoview option parsing
+Patch2:     mrepo-repoview_options.patch
+BuildRoot:  %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+BuildArch:  noarch
 
-BuildRequires:	python-devel
+BuildRequires:  python-devel
 
 # Needed for operation
-Requires:	createrepo
+Requires:   createrepo
 # For SELinux compatibility
-Requires:	libselinux-python
+Requires:   libselinux-python
 ## For dir ownership
 # vixie-cron in older distros, cronie in newer ones; filelist of sbindir is always available
-Requires:	%{_sbindir}/crond
-Requires:	webserver
-Requires:	logrotate
+Requires:   %{_sbindir}/crond
+Requires:   webserver
+Requires:   logrotate
 
 # For services
-Requires(post):		chkconfig
-Requires(preun):	chkconfig
-Requires(preun):	initscripts
-Requires(postun):	initscripts
+Requires(post):     chkconfig
+Requires(preun):    chkconfig
+Requires(preun):    initscripts
+Requires(postun):   initscripts
 
 
 %description
@@ -58,7 +58,6 @@ allow installations via the network.
 %setup -q
 %patch0 -p1 -b .init
 %patch1 -p1 -b .selinux
-%patch2 -p1 -b .python26
 
 rm docs/client-configuration.txt
 
@@ -103,8 +102,8 @@ make install DESTDIR="%{buildroot}"
 
 %preun
 if [ $1 = 0 ]; then
-	/sbin/service mrepo stop >/dev/null 2>&1 || :
-	/sbin/chkconfig --del mrepo
+    /sbin/service mrepo stop >/dev/null 2>&1 || :
+    /sbin/chkconfig --del mrepo
 fi
 
 %postun
@@ -134,6 +133,10 @@ rm -rf %{buildroot}
 %{_localstatedir}/mrepo/
 
 %changelog
+* Tue Aug 03 2010 James Findley <sixy at gmx.com> - 0.8.7-2
+- Backed out a patch that required hashlib (#620704).
+- Fixed repoview parsing (#620788).
+
 * Thu Jul 08 2010 James Findley <sixy at gmx.com> - 0.8.7-1
 - Update to release 0.8.7 (fixes #610140 and #604277).
 - Patch to fix two deprecation warnings on python 2.6.