From 01edaea96725c07f645aa729373f2132af0a1b2d230efd623fcb2a605931c966 Mon Sep 17 00:00:00 2001 From: Ruediger Meier Date: Sun, 4 Sep 2016 16:26:54 +0000 Subject: [PATCH] Accepting request 424651 from home:pluskalm:branches:hardware Use modern macros for KMP (note that they do not work on SLE-11), sadly documentation and rpmlintrc warnings have not been updated yet. For example of their usage see i.e - https://build.opensuse.org/package/show/X11:Bumblebee/bbswitch . OBS-URL: https://build.opensuse.org/request/show/424651 OBS-URL: https://build.opensuse.org/package/show/hardware/ftsteutates?expand=0&rev=4 --- ftsteutates.changes | 6 ++++++ ftsteutates.spec | 36 +++++++++++++----------------------- preamble | 1 - 3 files changed, 19 insertions(+), 24 deletions(-) delete mode 100644 preamble diff --git a/ftsteutates.changes b/ftsteutates.changes index 22af3e8..7b8f9c4 100644 --- a/ftsteutates.changes +++ b/ftsteutates.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Sep 4 06:20:43 UTC 2016 - mpluskal@suse.com + +- Use url for source +- Use modern macros for KMP handling + ------------------------------------------------------------------- Tue Jul 12 10:28:57 UTC 2016 - sweet_f_a@gmx.de diff --git a/ftsteutates.spec b/ftsteutates.spec index d931ba7..293c652 100644 --- a/ftsteutates.spec +++ b/ftsteutates.spec @@ -1,7 +1,7 @@ # # spec file for package ftsteutates # -# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,26 +23,16 @@ Summary: Kernel module ftsteutates License: GPL-2.0+ Group: System/Kernel Url: ftp://ftp.ts.fujitsu.com/pub/Mainboard-OEM-Sales/Services/ -Source0: ftsteutates-module_%{version}.zip -Source1: preamble -BuildRequires: kernel-source -BuildRequires: kernel-syms -BuildRequires: module-init-tools +Source0: ftp://ftp.ts.fujitsu.com/pub/Mainboard-OEM-Sales/Services/Software&Tools/Linux_SystemMonitoring&Watchdog&GPIO/ftsteutates-module_%{version}.zip +BuildRequires: %{kernel_module_package_buildreqs} BuildRequires: unzip BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: %ix86 x86_64 -%suse_kernel_module_package -p %_sourcedir/preamble +%kernel_module_package +ExclusiveArch: %{ix86} x86_64 %description -System monitoring and thermal management for -Teutates chips/Fujitsu mainboards (D34xx). - -%package KMP -Summary: Kernel module ftsteutates -Group: System/Kernel - -%description KMP -System monitoring and thermal management for Fujitsu mainboards (D34xx). +System monitoring and thermal management for Teutates chips/Fujitsu +mainboards (D34xx). %package sensors Summary: Sensors config ftsteutates @@ -52,8 +42,8 @@ BuildArch: noarch %description sensors System monitoring and thermal management for Fujitsu mainboards (D34xx). -This package contains the mainboard model specific config files for -nice lm-sensors output. +This package contains the mainboard model specific config files for nice +lm-sensors output. %prep %setup -q -n ftsteutates @@ -62,10 +52,10 @@ mkdir obj cp -a Makefile ftsteutates.c source/ %build -for flavor in %flavors_to_build; do +for flavor in %{flavors_to_build}; do rm -rf obj/$flavor cp -r source obj/$flavor - make -C /usr/src/linux-obj/%_target_cpu/$flavor modules \ + make -C %{_prefix}/src/linux-obj/%{_target_cpu}/$flavor modules \ M=$PWD/obj/$flavor done @@ -73,8 +63,8 @@ done # install kernel modules export INSTALL_MOD_PATH=%{buildroot} export INSTALL_MOD_DIR=updates -for flavor in %flavors_to_build; do - make -C /usr/src/linux-obj/%_target_cpu/$flavor modules_install \ +for flavor in %{flavors_to_build}; do + make -C %{_prefix}/src/linux-obj/%{_target_cpu}/$flavor modules_install \ M=$PWD/obj/$flavor done diff --git a/preamble b/preamble deleted file mode 100644 index ace95d0..0000000 --- a/preamble +++ /dev/null @@ -1 +0,0 @@ -Requires: kernel-%1