devel/mkinitrd .cvsignore, 1.186, 1.187 mkinitrd.spec, 1.264, 1.265 sources, 1.228, 1.229

[Jeremy Katz (katzj)]

Author: katzj

Update of /cvs/pkgs/devel/mkinitrd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26690

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
* Mon Apr 14 2008 Jeremy Katz <katzj at redhat.com> - 6.0.47-1
- Fix merge fun



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/devel/mkinitrd/.cvsignore,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- .cvsignore	14 Apr 2008 14:40:24 -0000	1.186
+++ .cvsignore	14 Apr 2008 19:05:02 -0000	1.187
@@ -1,2 +1 @@
-clog
-mkinitrd-6.0.46.tar.bz2
+mkinitrd-6.0.47.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/pkgs/devel/mkinitrd/mkinitrd.spec,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -r1.264 -r1.265
--- mkinitrd.spec	14 Apr 2008 14:40:24 -0000	1.264
+++ mkinitrd.spec	14 Apr 2008 19:05:02 -0000	1.265
@@ -2,7 +2,7 @@
 
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 6.0.46
+Version: 6.0.47
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
@@ -118,6 +118,9 @@
 %dir %{_sysconfdir}/kernel/prerm.d
 
 %changelog
+* Mon Apr 14 2008 Jeremy Katz <katzj at redhat.com> - 6.0.47-1
+- Fix merge fun
+
 * Mon Apr 14 2008 Peter Jones <pjones at redhat.com> - 6.0.46-1
 - Fix ps3 disk handling in /proc/devices (#389331)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/devel/mkinitrd/sources,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -r1.228 -r1.229
--- sources	14 Apr 2008 14:40:24 -0000	1.228
+++ sources	14 Apr 2008 19:05:02 -0000	1.229
@@ -1 +1 @@
-20a8ef33021facfd9e0d24561830b582  mkinitrd-6.0.46.tar.bz2
+cc336b7d0f9eed3f657fc4b36e65c538  mkinitrd-6.0.47.tar.bz2