rpms/mrepo/F-13 .cvsignore, 1.2, 1.3 mrepo-initd.patch, 1.1, 1.2 mrepo-selinux.patch, 1.1, 1.2 mrepo.spec, 1.6, 1.7 sources, 1.2, 1.3

[James Findley]

Author: sixy

Update of /cvs/pkgs/rpms/mrepo/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv27933

Modified Files:
	.cvsignore mrepo-initd.patch mrepo-selinux.patch mrepo.spec 
	sources 
Log Message:
Update to 0.8.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mrepo/F-13/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	12 Jul 2009 18:59:42 -0000	1.2
+++ .cvsignore	8 Jul 2010 11:52:41 -0000	1.3
@@ -1 +1,2 @@
-mrepo-0.8.6.tar.bz2
+mrepo-0.8.7.tar.bz2
+mrepo-python26.patch

mrepo-initd.patch:
 mrepo |  122 ++++++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 71 insertions(+), 51 deletions(-)

Index: mrepo-initd.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mrepo/F-13/mrepo-initd.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mrepo-initd.patch	12 Jul 2009 18:59:42 -0000	1.1
+++ mrepo-initd.patch	8 Jul 2010 11:52:41 -0000	1.2
@@ -1,6 +1,5 @@
-diff -up mrepo-0.8.4/config/mrepo.orig mrepo-0.8.4/config/mrepo
---- mrepo-0.8.4/config/mrepo.orig	2006-12-08 21:53:27.000000000 +0200
-+++ mrepo-0.8.4/config/mrepo	2009-05-20 11:14:35.000000000 +0300
+--- mrepo-0.8.7/config/mrepo.orig	2010-07-08 10:05:46.527269670 +0100
++++ mrepo-0.8.7/config/mrepo	2010-07-08 10:05:28.091257576 +0100
 @@ -4,74 +4,94 @@
  #
  # Written by Dag Wieers <dag at wieers.com>.
@@ -24,7 +23,7 @@ diff -up mrepo-0.8.4/config/mrepo.orig m
 -
 -### Read configuration
 -[ -r "$SYSCONFIG" ] && source "$SYSCONFIG"
-+exec="mrepo"
++exec="/usr/bin/mrepo"
 +prog="mrepo"
 +config="/etc/mrepo.conf"
  
@@ -44,13 +43,13 @@ diff -up mrepo-0.8.4/config/mrepo.orig m
 -	echo
 -	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
 -	return $RETVAL
-+    [ -x $exec ] || exit 5
-+    [ -f $config ] || exit 6
++    [[ -x $exec ]] || exit 5
++    [[ -f $config ]] || exit 6
 +    echo -n $"Starting $prog: "
-+    mrepo -q -c $config
++    daemon $exec -q -c $config
 +    retval=$?
 +    echo
-+    [ $retval -eq 0 ] && touch $lockfile
++    [[ $retval == 0 ]] && touch $lockfile
 +    return $retval
  }
  
@@ -63,7 +62,7 @@ diff -up mrepo-0.8.4/config/mrepo.orig m
 -	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
 -	return $RETVAL
 +    echo -n $"Stopping $prog: "
-+    mrepo -q --umount -c $config
++    $exec -q --umount -c $config
 +    retval=$?
 +    echo
 +    [ $retval -eq 0 ] && rm -f $lockfile

mrepo-selinux.patch:
 mrepo |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Index: mrepo-selinux.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mrepo/F-13/mrepo-selinux.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mrepo-selinux.patch	10 May 2010 21:14:41 -0000	1.1
+++ mrepo-selinux.patch	8 Jul 2010 11:52:41 -0000	1.2
@@ -1,15 +1,15 @@
-diff -up mrepo-0.8.6/mrepo.orig mrepo-0.8.6/mrepo
---- mrepo-0.8.6/mrepo.orig	2008-10-06 23:46:37.000000000 +0300
-+++ mrepo-0.8.6/mrepo	2010-05-10 23:55:45.121368657 +0300
-@@ -18,6 +18,7 @@ from __future__ import generators # for 
+--- mrepo-0.8.7/mrepo.orig	2010-07-08 10:03:53.161522220 +0100
++++ mrepo-0.8.7/mrepo	2010-07-08 10:24:21.670257725 +0100
+@@ -17,7 +17,7 @@
+ from __future__ import generators # for Python 2.2
  import os, sys, glob, re, shutil, getopt, popen2
  import ConfigParser, urlparse, sha, types, traceback
- import time
-+import selinux
+-import time
++import time, selinux
  
  __version__ = "$Revision$"
  # $Source$
-@@ -517,8 +518,8 @@ class Dist:
+@@ -517,8 +517,8 @@ class Dist:
              opts = '-o loop,ro'
              extra_opts = ''
              mount_cmd = cf.cmd['mount']


Index: mrepo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mrepo/F-13/mrepo.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- mrepo.spec	10 May 2010 21:14:41 -0000	1.6
+++ mrepo.spec	8 Jul 2010 11:52:41 -0000	1.7
@@ -1,15 +1,21 @@
 Name:		mrepo
-Version:	0.8.6
-Release:	6%{?dist}
+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/
-Source0:	http://dag.wieers.com/home-made/mrepo/mrepo-%{version}.tar.bz2
+# 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
 # Patch initfile to conform to new standards
 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
 
@@ -52,9 +58,8 @@ allow installations via the network.
 %setup -q
 %patch0 -p1 -b .init
 %patch1 -p1 -b .selinux
+%patch2 -p1 -b .python26
 
-# Stop if file has content, remove empty file
-[ -s client-configuration.txt ] && exit 1
 rm docs/client-configuration.txt
 
 perl -pi.orig -e 's|^(VERSION)\s*=\s*.+$|$1 = "%{version}"|' mrepo
@@ -129,6 +134,11 @@ rm -rf %{buildroot}
 %{_localstatedir}/mrepo/
 
 %changelog
+* 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.
+- Patched initscript to fix #590233.
+
 * Mon May 10 2010 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.8.6-6
 - Patch to get iso mounting working with SElinux (#589755).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mrepo/F-13/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	12 Jul 2009 18:59:42 -0000	1.2
+++ sources	8 Jul 2010 11:52:41 -0000	1.3
@@ -1 +1,2 @@
-1d6122cc21ee74cc9211d181011fb618  mrepo-0.8.6.tar.bz2
+e4384b0bd823eb79716482f6329d294e  mrepo-0.8.7.tar.bz2
+f4f972f0b684a536057a10100df0b3a2  mrepo-python26.patch