rpms/kexec-tools/devel kexec-tools.spec,1.131,1.132

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/kexec-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15238

Modified Files:
	kexec-tools.spec 
Log Message:
* Sun Apr 05 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.0.0-11
- Install the correct configuration for i586



Index: kexec-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- kexec-tools.spec	3 Apr 2009 20:06:29 -0000	1.131
+++ kexec-tools.spec	5 Apr 2009 12:20:13 -0000	1.132
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 2.0.0 
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -121,11 +121,12 @@
 mkdir -p -m755 $RPM_BUILD_ROOT%{_datadir}/kdump
 mkdir -p -m755 $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
 install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/kdump
-if [ -f $RPM_SOURCE_DIR/kdump.sysconfig.%{_target_cpu} ]; then
-	install -m 644 $RPM_SOURCE_DIR/kdump.sysconfig.%{_target_cpu} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/kdump
-else
-	install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/kdump
-fi
+
+SYSCONFIG=$RPM_SOURCE_DIR/kdump.sysconfig.%{_target_cpu}
+[ -f $SYSCONFIG ] || SYSCONFIG=$RPM_SOURCE_DIR/kdump.sysconfig.%{_arch}
+[ -f $SYSCONFIG ] || SYSCONFIG=$RPM_SOURCE_DIR/kdump.sysconfig
+install -m 644 $SYSCONFIG $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/kdump
+
 install -m 755 %{SOURCE7} $RPM_BUILD_ROOT/sbin/mkdumprd
 install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/kdump.conf
 install -m 644 kexec/kexec.8 $RPM_BUILD_ROOT%{_mandir}/man8/kexec.8
@@ -242,6 +243,9 @@
 
 
 %changelog
+* Sun Apr 05 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.0.0-11
+- Install the correct configuration for i586
+
 * Fri Apr 03 2009 Neil Horman <nhorman at redhat.com> - 2.0.0-10
 - Fix problem with quoted CORE_COLLECTOR string (bz 493707)