From 00869a772727ea31304c10c2e6ee9309d37aa432a9b30e403e38a86f82b3e010 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Fri, 22 Jun 2012 21:57:21 +0000
Subject: [PATCH] Annotate patch; trim changelog to the important things; place
 in current URLs

OBS-URL: https://build.opensuse.org/package/show/Base:System/kmod?expand=0&rev=33
---
 fix-32bits.diff      |  5 +++++
 kmod-so-version.diff |  2 +-
 kmod.changes         | 15 +++++----------
 kmod.spec            | 37 +++++++++++++++++++------------------
 4 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/fix-32bits.diff b/fix-32bits.diff
index 20cafcc..659158f 100644
--- a/fix-32bits.diff
+++ b/fix-32bits.diff
@@ -1,3 +1,8 @@
+Author: Robert Milasan <rmilasan@suse.com>
+Date: 2012-06-20 08:41:03 +0000
+
+Fix broken testsuites on 32-bit systems.
+
 diff --git a/testsuite/init_module.c b/testsuite/init_module.c
 index 814998a..ed8b9fc 100644
 --- a/testsuite/init_module.c
diff --git a/kmod-so-version.diff b/kmod-so-version.diff
index 8c2e55f..37c3736 100644
--- a/kmod-so-version.diff
+++ b/kmod-so-version.diff
@@ -18,7 +18,7 @@ Index: kmod-9/Makefile.am
  
  libkmod_libkmod_la_LDFLAGS = $(AM_LDFLAGS) \
 -	-version-info $(LIBKMOD_CURRENT):$(LIBKMOD_REVISION):$(LIBKMOD_AGE) \
-+	-version-number 2:1 \
++	-version-number 2:1:3 \
  	-Wl,--version-script=$(top_srcdir)/libkmod/libkmod.sym
  libkmod_libkmod_la_DEPENDENCIES = libkmod/libkmod-util.la \
  				  ${top_srcdir}/libkmod/libkmod.sym
diff --git a/kmod.changes b/kmod.changes
index 7c2757d..1b7b051 100644
--- a/kmod.changes
+++ b/kmod.changes
@@ -2,17 +2,12 @@
 Wed Jun 20 08:41:03 UTC 2012 - rmilasan@suse.com
 
 - Update to new upstream release 9
-* build-sys: allow compressed modules in testsuite
-* build-sys: Make dirs writable on rootfs creation
-* depmod: use ferror and fclose to check for error
-* depmod: return error when index is truncated due to ENOSPC
-* depmod: fix coding-style issue in array declaration
-* depmod: fail if any index could not be created
-* depmod: don't return error if modules.builtin don't exist
-* libkmod-util: split function for usec conversion
-* libkmod-util: add missing stdbool.h include
-- Fix broken testsuites on 32bit systems.
+* Handle errors when dealing with gzip'ed modules
+* depmod now handles and prints errors while writing indexes, such
+  that the user won't have a corrupted index without knowing it
+- Fix broken testsuites on 32-bit systems.
   add: fix-32bits.diff
+
 -------------------------------------------------------------------
 Sat Apr 21 01:55:30 UTC 2012 - jengelh@medozas.de
 
diff --git a/kmod.spec b/kmod.spec
index 88c1c16..ca49035 100644
--- a/kmod.spec
+++ b/kmod.spec
@@ -23,12 +23,13 @@ License:        LGPL-2.1+ and GPL-2.0+
 Group:          System/Kernel
 Version:        9
 Release:        0
-Url:            http://www.politreco.com/2011/12/announce-kmod-2/
+Url:            http://www.jonmasters.org/blog/2011/12/20/libkmod-replaces-module-init-tools/
+#Announce:	https://lwn.net/Articles/502622/
 
 #Git-Web:	http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary
 #Git-Clone:	git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod
-Source:         %name-%version.tar.xz
-Source2:        %name-%version.tar.sign
+Source:         ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/%name-%version.tar.xz
+Source2:        ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/%name-%version.tar.sign
 Patch1:         kmod-so-version.diff
 Patch2:         fix-32bits.diff
 
@@ -97,32 +98,32 @@ autoreconf -fi
 %configure \
    --with-xz \
    --with-zlib \
-   --includedir=%_includedir/%{name}-%{version} \
-   --with-rootlibdir=%{_libdir} \
-   --bindir=%{_bindir}
+   --includedir="%_includedir/%name-%version" \
+   --with-rootlibdir="%_libdir" \
+   --bindir="%_bindir"
 make %{?_smp_mflags}
 
 %install
 %make_install
-rm -f %buildroot/%_libdir/*.la
+rm -f "%buildroot/%_libdir"/*.la
 
 # kmod-compat
 #UsrMerge
-mkdir -p %buildroot/bin 
-mkdir -p %buildroot/sbin
-mkdir -p %buildroot/%_lib
-ln -s %{_bindir}/kmod %buildroot/bin
-ln -s %{_bindir}/kmod %buildroot/bin/lsmod
+mkdir -p "%buildroot"/{bin,sbin,%_lib};
+ln -s "%_bindir/kmod" "%buildroot/bin/";
+ln -s "%_bindir/kmod" "%buildroot/bin/lsmod";
 for i in depmod insmod lsmod modinfo modprobe rmmod; do
-	ln -s %{_bindir}/kmod %buildroot/sbin/$i
+	ln -s "%_bindir/kmod" "%buildroot/sbin/$i";
 done;
-ln -s %_libdir/libkmod.so.2 %buildroot/%_lib
-ln -s %_libdir/libkmod.so.2.1.0 %buildroot/%_lib
+%if "%_libdir" != "/%_lib"
+ln -s "%_libdir/libkmod.so.2" "%buildroot/%_lib/";
+ln -s "%_libdir/libkmod.so.2.1.3" "%buildroot/%_lib/";
+%endif
 #EndUsrMerge
-mkdir -p %buildroot/%{_sbindir}
-ln -s %{_bindir}/kmod %buildroot/%{_bindir}/lsmod
+mkdir -p "%buildroot/%_sbindir";
+ln -s "%_bindir/kmod" "%buildroot/%_bindir/lsmod";
 for i in depmod insmod lsmod modinfo modprobe rmmod; do
-	ln -s %{_bindir}/kmod %buildroot/%{_sbindir}/$i
+	ln -s "%_bindir/kmod" "%buildroot/%_sbindir/$i";
 done;
 
 %check