Accepting request 225484 from home:michal-m:branches:Base:System

- The package cannot be noarch, because it installs different
  configs for different architectures.
- Install 10-unsupported-modules.conf unconditionally, kmod has
  been patched.

OBS-URL: https://build.opensuse.org/request/show/225484
OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-module-tools?expand=0&rev=7

suse-module-tools.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Mar 10 15:08:15 UTC 2014 - mmarek@suse.cz
+
+- The package cannot be noarch, because it installs different
+  configs for different architectures.
+- Install 10-unsupported-modules.conf unconditionally, kmod has
+  been patched.
+
 -------------------------------------------------------------------
 Wed May 29 12:44:00 UTC 2013 - schwab@suse.de
 

suse-module-tools.rpmlintrc

@@ -0,0 +1,2 @@
+# The package installs different configs for different architectures
+addFilter("no-binary");

suse-module-tools.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package suse-module-tools
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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
@@ -36,8 +36,8 @@ Source4:        10-unsupported-modules.conf
 Source5:        weak-modules
 Source6:        weak-modules2
 Source7:        driver-check.sh
+Source8:        suse-module-tools.rpmlintrc
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildArch:      noarch
 
 %description
 This package contains helper scripts for KMP installation and
@@ -63,10 +63,8 @@ if [ -f "modprobe.conf.$RPM_ARCH" ]; then
 	cat "modprobe.conf.$RPM_ARCH" >>00-system.conf
 fi
 install -d -m 755 "$b/etc/modprobe.d"
-%if 0%{?sles_version}
 install -pm644 "%_sourcedir/10-unsupported-modules.conf" \
 	"$b/etc/modprobe.d/"
-%endif
 install -pm644 00-system.conf "$b/etc/modprobe.d/"
 install -pm644 modprobe.conf.local "$b/etc/modprobe.d/99-local.conf"
 install -d -m 755 "$b/etc/depmod.d"
@@ -79,7 +77,6 @@ install -pm 755 %_sourcedir/weak-modules{,2} "$b/usr/lib/module-init-tools/"
 install -pm 755 %_sourcedir/driver-check.sh "$b/usr/lib/module-init-tools/"
 
 %post
-%if 0%{?sles_version}
 test_allow_on_install()
 {
 	# configure handling of unsupported modules
@@ -132,14 +129,12 @@ if test "$allow" = "0"; then
 	sed -ri 's/^( *allow_unsupported_modules *) 1/\1 0/' \
 		/etc/modprobe.d/10-unsupported-modules.conf
 fi
-%endif
+
 %files
 %defattr(-,root,root)
 %dir               /etc/modprobe.d
 %config            /etc/modprobe.d/00-system.conf
-%if 0%{?sles_version}
 %config(noreplace) /etc/modprobe.d/10-unsupported-modules.conf
-%endif
 %config(noreplace) /etc/modprobe.d/99-local.conf
 %dir               /etc/depmod.d
 %config            /etc/depmod.d/00-system.conf