[yum-cvs] yum-utils Makefile, 1.3, 1.4 repo-graph.py, 1.1, 1.2 yum-utils.spec, 1.9, 1.10

[Panu Matilainen]

Update of /home/groups/yum/cvs/yum-utils
In directory login1.linux.duke.edu:/tmp/cvs-serv9727

Modified Files:
	Makefile repo-graph.py yum-utils.spec 
Log Message:
Apply patch from Brian Long (with slight modifications):
- add fastestmirror subpackage
- mark config files config(noreplace)
- bump version to 0.4
- make lines in repo-graph a bit darker


Index: Makefile
===================================================================
RCS file: /home/groups/yum/cvs/yum-utils/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile	17 Oct 2005 20:25:06 -0000	1.3
+++ Makefile	10 Jan 2006 17:12:13 -0000	1.4
@@ -1,5 +1,6 @@
 SUBDIRS = docs
 PKGNAME = yum-utils
+UTILS = package-cleanup repoclosure repomanage repoquery repo-graph repo-rss yumdownloader yum-builddep
 VERSION=$(shell awk '/Version:/ { print $$2 }' ${PKGNAME}.spec)
 RELEASE=$(shell awk '/Release:/ { print $$2 }' ${PKGNAME}.spec)
 
@@ -8,13 +9,10 @@
 
 install:
 	mkdir -p $(DESTDIR)/usr/bin/
-	install -m 755 package-cleanup.py $(DESTDIR)/usr/bin/package-cleanup
-	install -m 755 repoclosure.py $(DESTDIR)/usr/bin/repoclosure
-	install -m 755 repomanage.py $(DESTDIR)/usr/bin/repomanage
-	install -m 755 repoquery.py $(DESTDIR)/usr/bin/repoquery
-	install -m 755 repo-rss.py $(DESTDIR)/usr/bin/repo-rss
-	install -m 755 yumdownloader.py $(DESTDIR)/usr/bin/yumdownloader
-	install -m 755 yum-builddep.py $(DESTDIR)/usr/bin/yum-builddep
+	mkdir -p $(DESTDIR)/usr/share/man/man1
+	for util in $(UTILS); do \
+		install -m 755 $$util.py $(DESTDIR)/usr/bin/$$util; \
+	done
 
 	for d in $(SUBDIRS); do make DESTDIR=`cd $(DESTDIR); pwd` -C $$d install; [ $$? = 0 ] || exit 1; done
 

Index: repo-graph.py
===================================================================
RCS file: /home/groups/yum/cvs/yum-utils/repo-graph.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- repo-graph.py	6 Jan 2006 15:06:59 -0000	1.1
+++ repo-graph.py	10 Jan 2006 17:12:13 -0000	1.2
@@ -48,8 +48,8 @@
                 maxdeps=len(deps[pkg])
 
             # color calculations lifted from rpmgraph 
-            h=0.4+(0.6/23*len(deps[pkg]))
-            s=h
+            h=0.5+(0.6/23*len(deps[pkg]))
+            s=h+0.1
             b=1.0
             
             print '"%s" [color="%s %s %s"];' % (pkg, h, s, b)

Index: yum-utils.spec
===================================================================
RCS file: /home/groups/yum/cvs/yum-utils/yum-utils.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- yum-utils.spec	17 Oct 2005 20:25:06 -0000	1.9
+++ yum-utils.spec	10 Jan 2006 17:12:13 -0000	1.10
@@ -1,6 +1,6 @@
 Summary: Utilities based around the yum package manager
 Name: yum-utils
-Version: 0.3.1
+Version: 0.4
 Release: 1
 License: GPL
 Group: Development/Tools
@@ -36,6 +36,15 @@
 This plugin adds a command line option to allow viewing package changelog 
 deltas before or after updating packages.
 
+%package -n yum-fastestmirror
+Summary: Yum plugin which chooses fastest repository from a mirrorlist
+Group: System Environment/Base
+Requires: yum >= 2.3.4
+
+%description -n yum-fastestmirror
+This plugin sorts each repository's mirrorlist by connection speed
+prior to downloading packages.
+
 %prep
 %setup -q
 
@@ -45,7 +54,7 @@
 make -C updateonboot DESTDIR=$RPM_BUILD_ROOT install
 
 # only changelog plugin for now...
-plugins="changelog"
+plugins="changelog fastestmirror"
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/ $RPM_BUILD_ROOT/usr/lib/yum-plugins/
 
 cd plugins
@@ -75,6 +84,7 @@
 %{_bindir}/repoclosure
 %{_bindir}/repomanage
 %{_bindir}/repoquery
+%{_bindir}/repo-graph
 %{_bindir}/repo-rss
 %{_bindir}/yumdownloader
 %{_bindir}/yum-builddep
@@ -83,15 +93,24 @@
 %files -n yum-updateonboot
 %defattr(-, root, root)
 %doc updateonboot/README
-%{_sysconfdir}/sysconfig/yum-updateonboot
+%config(noreplace) %{_sysconfdir}/sysconfig/yum-updateonboot
 %{_initrddir}/yum-updateonboot
 
 %files -n yum-changelog
 %defattr(-, root, root)
-%{_sysconfdir}/yum/pluginconf.d
-/usr/lib/yum-plugins
+%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/changelog.conf
+/usr/lib/yum-plugins/changelog.py
+
+%files -n yum-fastestmirror
+%defattr(-, root, root)
+%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/fastestmirror.conf
+/usr/lib/yum-plugins/fastestmirror.py
 
 %changelog
+* Tue Jan 10 2006 Brian Long <brilong at cisco.com>
+- bump version to 0.4
+- add yum-fastestmirror subpackage
+
 * Mon Oct 17 2005 Panu Matilainen <pmatilai at laiskiainen.org>
 - add repoquery man page