diff --git a/Makefile b/Makefile index 313cfb0..5e18ea9 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,6 @@ mkdumprd2_tarball: ln -s ../kdump_runtime_helpers stage/kdump_runtime_helpers ln -s ../kdump_initscripts stage/kdump_initscripts ln -s ../kdump_sample_manifests stage/kdump_sample_manifests - cp mkdumprd2 stage tar -C stage -j -c --exclude=CVS -f ./mkdumprd2-files.tbz2 . rm -rf stage diff --git a/kexec-tools.spec b/kexec-tools.spec index 8be7cdc..22bcf64 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -1,6 +1,6 @@ Name: kexec-tools Version: 2.0.0 -Release: 13%{?dist} +Release: 14%{?dist} License: GPLv2 Group: Applications/System Summary: The kexec/kdump userspace component. @@ -25,11 +25,11 @@ Source14: 98-kexec.rules # Which is currently in development ####################################### Source100: mkdumprd2-files.tbz2 +Source101: mkdumprd2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(pre): coreutils chkconfig sed zlib Requires: busybox >= 1.2.0 -BuildRequires: glibc-static BuildRequires: zlib-devel zlib zlib-static elfutils-devel-static glib2-devel BuildRequires: pkgconfig intltool gettext %ifarch %{ix86} x86_64 ppc64 ia64 ppc @@ -143,6 +143,11 @@ install -m 755 makedumpfile-1.3.3/makedumpfile $RPM_BUILD_ROOT/sbin/makedumpfile make -C kexec-tools-po install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} +# untar the mkdumprd2 package +mkdir -p -m755 $RPM_BUILD_ROOT/etc/kdump-adv-conf +tar -C $RPM_BUILD_ROOT/etc/kdump-adv-conf -jxvf %{SOURCE100} +install -m 755 %{SOURCE101} $RPM_BUILD_ROOT/sbin + %clean rm -rf $RPM_BUILD_ROOT @@ -235,6 +240,10 @@ done %{_datadir}/kdump %config(noreplace,missingok) %{_sysconfdir}/sysconfig/kdump %config(noreplace,missingok) %{_sysconfdir}/kdump.conf +%{_sysconfdir}/kdump-adv-conf/kdump_build_helpers/ +%{_sysconfdir}/kdump-adv-conf/kdump_runtime_helpers/ +%{_sysconfdir}/kdump-adv-conf/kdump_initscripts/ +%{_sysconfdir}/kdump-adv-conf/kdump_sample_manifests/ %config %{_sysconfdir}/rc.d/init.d/kdump %config %{_sysconfdir}/udev/rules.d/* %dir %{_localstatedir}/crash @@ -246,6 +255,9 @@ done %changelog +* Wed May 20 2009 Neil Horman 2.0.0-14 +- Put early copy of mkdumprd2 out in the wild (bz 466392) + * Fri May 08 2009 Neil Horman - 2.0.0-13 - Update makedumpfile to v 1.3.3 (bz 499849) diff --git a/sources b/sources index 8ae1518..0c8330b 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ d9f2ecd3c3307905f24130a25816e6cc kexec-tools-2.0.0.tar.bz2 3e802d638dce0080b910f15908c04a24 kexec-tools-po.tar.gz 190f8878aa7e7b63a96fde5d59538eec makedumpfile-1.3.3.tar.gz -e1ecc3c5e3d6fa8789f9d9e48e8fa184 mkdumprd2-files.tbz2 +f06ce57e7e4eb59dde1c986f8787c8b0 mkdumprd2-files.tbz2