rpms/mkinitrd/devel mkinitrd.spec,1.208,1.209 sources,1.185,1.186

[Peter Jones (pjones)]

Author: pjones

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

Modified Files:
	mkinitrd.spec sources 
Log Message:
- fix merge error



Index: mkinitrd.spec
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- mkinitrd.spec	31 Jul 2007 21:08:04 -0000	1.208
+++ mkinitrd.spec	31 Jul 2007 21:50:20 -0000	1.209
@@ -3,7 +3,7 @@
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
 Version: 6.0.10
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Base
 Source0: mkinitrd-%{version}.tar.bz2
@@ -111,6 +111,9 @@
 %{_libdir}/libbdevid.so.*
 
 %changelog
+* Tue Jul 31 2007 Peter Jones <pjones at redhat.com> - 6.0.10-2
+- rebuild to fix merge error.
+
 * Tue Jul 31 2007 Peter Jones <pjones at redhat.com> - 6.0.10-1
 - Fix nosegneg library discovery in get_dso_deps() (#244730)
 - Only do ld.so discovery once in get_dso_deps()


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/sources,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- sources	31 Jul 2007 21:08:04 -0000	1.185
+++ sources	31 Jul 2007 21:50:20 -0000	1.186
@@ -1 +1 @@
-8106a8db31b1eabbdd0b9f0d8e398d12  mkinitrd-6.0.10.tar.bz2
+523e5a30097920f51e9ea0ab9c51a778  mkinitrd-6.0.10.tar.bz2