Hello community, here is the log from the commit of package kexec-tools for openSUSE:Factory checked in at 2012-05-21 07:27:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old) and /work/SRC/openSUSE:Factory/.kexec-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kexec-tools", Maintainer is "to...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes 2011-12-08 11:29:34.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kexec-tools.new/kexec-tools.changes 2012-05-21 07:27:58.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 20 16:19:26 UTC 2012 - rschweik...@suse.com + +- place binaries into /usr tree (UsrMerge project) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kexec-tools.spec ++++++ --- /var/tmp/diff_new_pack.YSYY2R/_old 2012-05-21 07:28:00.000000000 +0200 +++ /var/tmp/diff_new_pack.YSYY2R/_new 2012-05-21 07:28:00.000000000 +0200 @@ -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 @@ %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 @@ %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 @@ 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 @@ %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 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
