rpms/mkinitrd/devel .cvsignore, 1.115, 1.116 mkinitrd.spec, 1.133, 1.134 sources, 1.128, 1.129

[fedora-cvs-commits at redhat.com]

Author: pjones

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- .cvsignore	30 Jun 2006 04:04:40 -0000	1.115
+++ .cvsignore	13 Jul 2006 15:37:18 -0000	1.116
@@ -1 +1,2 @@
-mkinitrd-5.0.46.tar.bz2
+bdevid-0.1.tar.bz2
+mkinitrd-5.0.47.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- mkinitrd.spec	12 Jul 2006 07:21:39 -0000	1.133
+++ mkinitrd.spec	13 Jul 2006 15:37:19 -0000	1.134
@@ -1,17 +1,21 @@
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 5.0.46
-Release: 1.1
+Version: 5.0.47
+Release: 1
 License: GPL
 Group: System Environment/Base
-Source: mkinitrd-%{version}.tar.bz2
+Source0: mkinitrd-%{version}.tar.bz2
+%define BDEVID_VERSION 0.1
+Source1: bdevid-%{BDEVID_VERSION}.tar.bz2
+
 ExclusiveOs: Linux
 Prereq: dev
 Requires: /bin/sh, /sbin/insmod.static, /sbin/losetup
 Requires: fileutils, grep, mount, gzip, tar, mktemp >= 1.5-5, findutils, lvm2
 Requires: filesystem >= 2.1.0, cpio, device-mapper, initscripts >= 8.22-1
 Requires: e2fsprogs >= 1.38-12
-BuildRequires: popt e2fsprogs-devel parted-devel pump-devel
+BuildRequires: popt e2fsprogs-devel parted-devel >= 1.7.1-9
+BuildRequires: libdhcp4client-devel, libdhcp6client-devel, libdhcp-devel
 BuildRequires: device-mapper libselinux-devel libsepol-devel
 %ifnarch s390 s390x
 Requires: dmraid
@@ -36,17 +40,32 @@
 mount the root filesystem.  The mkinitrd program creates such a
 ramdisk using information found in the /etc/modules.conf file.
 
+%package devel
+Summary: C header files and library for functionality exported by libnash.
+Group: Development/Libraries
+Requires: glibc-devel
+
+%description devel
+C header files and library for functionality exported by libnash.
+
 %prep
-%setup -q
+%setup -q -c -a 0
+%setup -q -c -a 1
 
 %build
+cd mkinitrd-%{version}
 make
 make test
 if [ $? != 0 ]; then exit 1; fi
+cd ../bdevid-%{BDEVID_VERSION}
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
+cd mkinitrd-%{version}
 make BUILDROOT=$RPM_BUILD_ROOT mandir=%{_mandir} install
+cd ../bdevid-%{BDEVID_VERSION}
+make DESTDIR=$RPM_BUILD_ROOT install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -61,10 +80,34 @@
 %attr(755,root,root) /sbin/new-kernel-pkg
 %attr(755,root,root) /sbin/grubby
 %attr(644,root,root) %{_mandir}/man8/grubby.8*
+%{_libdir}/libbdevid.so*
+/lib/bdevid/scsi.so
+%{_libdir}/python*/site-packages/bdevid.so
+
+%files devel
+%defattr(-,root,root)
+%{_libdir}/libnash.a
+%{_libdir}/pkgconfig/libnash.pc
+%{_includedir}/nash.h
+%{_includedir}/nash
+
+%{_libdir}/libbdevid.a
+%{_libdir}/pkgconfig/libbdevid.pc
+%{_includedir}/bdevid.h
+%{_includedir}/bdevid
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 5.0.46-1.1
-- rebuild
+* Thu Jul 13 2006 Peter Jones <pjones at redhat.com> - 5.0.47-1
+- add libbdevid
+- fix mode handling on open syscall wrapper (patch from Mark McLoughlin)
+
+* Thu Jul  6 2006 Bill Nottingham <notting at redhat.com>
+- if NFS host doesn't resolve, assume it's an IP
+- make sure IP check doesn't get extraneous info
+
+* Wed Jul  5 2006 Peter Jones <pjones at redhat.com>
+- make libnash.a and the nash-devel package
+- use libdhcp instead of pump (patch from Mark McLoughlin)
 
 * Fri Jun 30 2006 Jeremy Katz <katzj at redhat.com> - 5.0.46-1
 - if we don't get a modalias for a net driver, try via 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- sources	30 Jun 2006 04:04:41 -0000	1.128
+++ sources	13 Jul 2006 15:37:19 -0000	1.129
@@ -1 +1,2 @@
-f99f6a6e7e66ac3f3022b97ff0e375f9  mkinitrd-5.0.46.tar.bz2
+7608e5c8e6b43ffcfc68b284f756a1e2  bdevid-0.1.tar.bz2
+06af8b8edbdcf5bd3f37bc764508e7e5  mkinitrd-5.0.47.tar.bz2