rpms/mkinitrd/devel .cvsignore, 1.130, 1.131 mkinitrd.spec, 1.160, 1.161 sources, 1.158, 1.159

[fedora-cvs-commits at redhat.com]

Author: pjones

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7935

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



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- .cvsignore	1 Sep 2006 22:04:05 -0000	1.130
+++ .cvsignore	5 Sep 2006 22:46:33 -0000	1.131
@@ -1,2 +1,2 @@
 mkinitrd-5.1.10.tar.bz2
-bdevid-0.5.tar.bz2
+mkinitrd-5.1.11.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- mkinitrd.spec	1 Sep 2006 22:04:05 -0000	1.160
+++ mkinitrd.spec	5 Sep 2006 22:46:34 -0000	1.161
@@ -3,13 +3,11 @@
 
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 5.1.10
+Version: 5.1.11
 Release: 1
 License: GPL
 Group: System Environment/Base
 Source0: mkinitrd-%{version}.tar.bz2
-%define BDEVID_VERSION 0.5
-Source1: bdevid-%{BDEVID_VERSION}.tar.bz2
 
 ExclusiveOs: Linux
 Prereq: dev
@@ -63,27 +61,16 @@
 Python bindings for libbdevid.
 
 %prep
-%setup -q -c -a 1
+%setup -q -n mkinitrd-%{version}
 
 %build
-cd mkinitrd-%{version}
 make LIB=%{_lib}
 make LIB=%{_lib} test
-if [ $? != 0 ]; then exit 1; fi
-cd ..
-cp -a mkinitrd-%{version}/nash/libnash.a bdevid-%{BDEVID_VERSION}/bdevid/
-cp -a mkinitrd-%{version}/nash/include/nash* \
-	bdevid-%{BDEVID_VERSION}/include/
-cd bdevid-%{BDEVID_VERSION}
-make LIB=%{_lib}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd mkinitrd-%{version}
-make LIB=%{_lib} BUILDROOT=$RPM_BUILD_ROOT mandir=%{_mandir} install
-cd ../bdevid-%{BDEVID_VERSION}
-make LIB=%{_lib} DESTDIR=$RPM_BUILD_ROOT install
-rm -f $RPM_BUILD_ROOT/sbin/bdevid
+make LIB=%{_lib} DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install
+rm -f $RPM_BUILD_ROOT/sbin/bdevid $RPM_BUILD_ROOT/%{_includedir}/blkent.h
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -117,6 +104,14 @@
 /%{python_sitelib}/bdevid.so
 
 %changelog
+* Tue Sep  5 2006 Peter Jones <pjones at redhat.com> - 5.1.11-1
+- Pull in bdevid properly (not two sources any more)
+- Lots of minor bugfixes, leak fixups, etc.
+- Updates for new iScsi userland (katzj)
+- ata and usb device id probes in bdevid
+- preliminary work for boot-time device identification.
+- Fixes for network driver selection (katzj)
+
 * Fri Sep  1 2006 Peter Jones <pjones at redhat.com> - 5.1.10-1
 - Fix %%setup args
 - Work around lvm locking problems when clvm is installed (#203904)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- sources	1 Sep 2006 22:04:05 -0000	1.158
+++ sources	5 Sep 2006 22:46:34 -0000	1.159
@@ -1,2 +1,2 @@
-9164264f56828489afb1bc2a8af10176  bdevid-0.5.tar.bz2
 276a3fbf3c0a47db960c2e2decefac4b  mkinitrd-5.1.10.tar.bz2
+8b5af4408300047e763831a8fae6207f  mkinitrd-5.1.11.tar.bz2