rpms/mkinitrd/devel .cvsignore, 1.150, 1.151 mkinitrd.spec, 1.213, 1.214 sources, 1.193, 1.194

[Peter Jones (pjones)]

Author: pjones

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

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
- update to .12-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- .cvsignore	27 Aug 2007 15:28:08 -0000	1.150
+++ .cvsignore	27 Aug 2007 21:51:06 -0000	1.151
@@ -1 +1 @@
-mkinitrd-6.0.11.tar.bz2
+mkinitrd-6.0.12.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- mkinitrd.spec	27 Aug 2007 15:47:05 -0000	1.213
+++ mkinitrd.spec	27 Aug 2007 21:51:06 -0000	1.214
@@ -2,8 +2,8 @@
 
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 6.0.11
-Release: 2%{?dist}
+Version: 6.0.12
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
 Source0: mkinitrd-%{version}.tar.bz2
@@ -113,6 +113,9 @@
 %{_libdir}/libbdevid.so.*
 
 %changelog
+* Mon Aug 27 2007 Peter Jones <pjones at redhat.com> - 6.0.12-1
+- Unmerge one of the 'bash' branch changes; it's not ready yet.
+
 * Mon Aug 27 2007 Peter Jones <pjones at redhat.com> - 6.0.11-2
 - Fix minor build problem on x86_64.
 - Add BR: popt-devel


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/devel/sources,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- sources	27 Aug 2007 17:45:43 -0000	1.193
+++ sources	27 Aug 2007 21:51:06 -0000	1.194
@@ -1 +1 @@
-39eb230b4c6cff613d075625363cb95b  mkinitrd-6.0.11.tar.bz2
+933573bdbe8321c362673138004553a5  mkinitrd-6.0.12.tar.bz2