rpms/mkinitrd/devel mkinitrd-6.0.12-mkblkdevs.patch, 1.1, 1.2 mkinitrd.spec, 1.215, 1.216

[Peter Jones (pjones)]

Author: pjones

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

Modified Files:
	mkinitrd-6.0.12-mkblkdevs.patch mkinitrd.spec 
Log Message:
- fix mkblkdevs patch


mkinitrd-6.0.12-mkblkdevs.patch:

Index: mkinitrd-6.0.12-mkblkdevs.patch
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/mkinitrd-6.0.12-mkblkdevs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mkinitrd-6.0.12-mkblkdevs.patch	28 Aug 2007 21:54:45 -0000	1.1
+++ mkinitrd-6.0.12-mkblkdevs.patch	28 Aug 2007 23:16:35 -0000	1.2
@@ -4,21 +4,6 @@
 
     Process subdirs right in mkblkdevs
 
-diff --git a/ChangeLog b/ChangeLog
-index 2b04830..640fc8e 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,5 +1,10 @@
- 2007-08-28  Peter Jones  <pjones at redhat.com>
- 
-+	* nash/devtree.c (nash_dev_tree_add_sysfs_dir): Fix this to actually
-+	process subdirectories correctly.
-+
-+2007-08-28  Peter Jones  <pjones at redhat.com>
-+
- 	* grubby/grubby.c: Add traceback() and install it as the signal
- 	handler for SIGSEGV.
- 
 diff --git a/nash/devtree.c b/nash/devtree.c
 index f8ec4d5..e1480aa 100644
 --- a/nash/devtree.c


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- mkinitrd.spec	28 Aug 2007 21:54:45 -0000	1.215
+++ mkinitrd.spec	28 Aug 2007 23:16:35 -0000	1.216
@@ -3,7 +3,7 @@
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
 Version: 6.0.12
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Base
 Source0: mkinitrd-%{version}.tar.bz2
@@ -117,6 +117,9 @@
 %{_libdir}/libbdevid.so.*
 
 %changelog
+* Mon Aug 27 2007 Peter Jones <pjones at redhat.com> - 6.0.12-3
+- Fix mkblkdevs patch to actually apply ;)
+
 * Mon Aug 27 2007 Peter Jones <pjones at redhat.com> - 6.0.12-2
 - Fix segfault in scsi vpd probe code
 - Fix block device creation