rpms/mkinitrd/devel .cvsignore, 1.165, 1.166 mkinitrd.spec, 1.236, 1.237 sources, 1.208, 1.209

[Peter Jones (pjones)]

Author: pjones

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

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
Fix merge error that reverted 6.0.25-1's change.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- .cvsignore	2 Jan 2008 21:00:47 -0000	1.165
+++ .cvsignore	2 Jan 2008 22:44:13 -0000	1.166
@@ -1 +1 @@
-mkinitrd-6.0.26.tar.bz2
+mkinitrd-6.0.27.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -r1.236 -r1.237
--- mkinitrd.spec	2 Jan 2008 21:00:47 -0000	1.236
+++ mkinitrd.spec	2 Jan 2008 22:44:13 -0000	1.237
@@ -2,7 +2,7 @@
 
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 6.0.26
+Version: 6.0.27
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
@@ -112,6 +112,9 @@
 %{_libdir}/libbdevid.so.*
 
 %changelog
+* Wed Jan 02 2008 Peter Jones <pjones at redhat.com> - 6.0.27-1
+- Fix merge error that caused 6.0.25-1's change to be reverted.
+
 * Wed Jan 02 2008 Peter Jones <pjones at redhat.com> - 6.0.26-1
 - Update copyright and license info
 - Add support for loading all available drivers.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/sources,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- sources	2 Jan 2008 21:00:47 -0000	1.208
+++ sources	2 Jan 2008 22:44:13 -0000	1.209
@@ -1 +1 @@
-b319ee6f1c8fec5b84ea5d3781a9e172  mkinitrd-6.0.26.tar.bz2
+7bfbf6946fe872519e7b3a059db40e0a  mkinitrd-6.0.27.tar.bz2