Accepting request 114880 from home:rjschwei:branches:Kernel:kdump

usrMerge project - move files from toplevel to /usr

OBS-URL: https://build.opensuse.org/request/show/114880
OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kexec-tools?expand=0&rev=19
This commit is contained in:
Petr Tesařík 2012-05-17 07:57:54 +00:00 committed by Git OBS Bridge
parent 4a32bec79a
commit 660ec8c794
2 changed files with 35 additions and 9 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Apr 20 16:19:26 UTC 2012 - rschweikert@suse.com
- place binaries into /usr tree (UsrMerge project)
-------------------------------------------------------------------
Fri Dec 2 16:42:47 UTC 2011 - coolo@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package kexec-tools
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -15,16 +15,17 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: kexec-tools
%ifarch ppc
BuildRequires: gcc-64bit
BuildRequires: glibc-devel-64bit
%endif
License: GPL-2.0+
Group: System/Kernel
Requires: perl-Bootloader
PreReq: %insserv_prereq %fillup_prereq
Summary: Tools for fast kernel loading
License: GPL-2.0+
Group: System/Kernel
Version: 2.0.2
Release: 0
Source: %{name}-%{version}.tar.bz2
@ -83,14 +84,12 @@ RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's/-fstack-protector//')
%endif
autoreconf -f
CFLAGS=$RPM_OPT_FLAGS BUILD_CFLAGS=$RPM_OPT_FLAGS \
./configure \
--prefix=/ \
%configure \
%ifarch ppc
--host=powerpc64-suse-linux \
--build=powerpc64-suse-linux \
%endif
--sbindir=/sbin \
--libdir=/%_lib || true
# --libdir=/%_lib || true
make
# manpage
cp %{S:1} .
@ -101,7 +100,7 @@ a2x -d manpage -f manpage kexec-bootloader.8.txt
%endif
%install
make DESTDIR=$RPM_BUILD_ROOT install
%makeinstall
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8
install -c -m 0644 kexec/kexec.8 $RPM_BUILD_ROOT%{_mandir}/man8
%if 0%{?suse_version} >= 1110
@ -111,11 +110,27 @@ install -m 0755 kexec-bootloader $RPM_BUILD_ROOT%{_sbindir}
mkdir -p ${RPM_BUILD_ROOT}/etc/init.d
install -m 0755 kexec.init ${RPM_BUILD_ROOT}/etc/init.d/kexec
%endif
#UsrMerge
mkdir -p $RPM_BUILD_ROOT/sbin
%ifarch %ix86 x86_64
mkdir -p $RPM_BUILD_ROOT/%_lib
ln -s %{_libdir}/kexec-tools $RPM_BUILD_ROOT/%_lib
%endif
ln -s %{_sbindir}/kdump $RPM_BUILD_ROOT/sbin
ln -s %{_sbindir}/kexec $RPM_BUILD_ROOT/sbin
#EndUsrMerge
%clean
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
%if 0%{?suse_version} >= 1110
#UsrMerge
%pre
if [ -d /%_lib/kexec-tools ];then
rm -rf /%_lib/kexec-tools
fi
#EndUsrMerge
%post
%{fillup_and_insserv -n kexec kexec}
%endif
@ -131,14 +146,20 @@ install -m 0755 kexec.init ${RPM_BUILD_ROOT}/etc/init.d/kexec
%defattr(-, root, root)
%doc AUTHORS COPYING News TODO doc
%doc %{_mandir}/man*/*
#UsrMerge
/sbin/*
%ifarch %ix86 x86_64
/%_lib/kexec-tools*
%endif
#EndUsrMerge
%{_sbindir}
%if 0%{?suse_version} >= 1110
%{_sbindir}/kexec-bootloader
/etc/init.d/kexec
%config /etc/init.d/kexec
%endif
%ifarch %ix86 x86_64
/%_lib/kexec-tools*
%{_libdir}/kexec-tools*
%endif
%changelog