Hello community,

here is the log from the commit of package kmod for openSUSE:Factory checked in 
at 2012-09-26 16:20:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kmod (Old)
 and      /work/SRC/openSUSE:Factory/.kmod.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "kmod", Maintainer is ""

Changes:
--------
--- /work/SRC/openSUSE:Factory/kmod/kmod.changes        2012-06-25 
14:16:18.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes   2012-09-26 
16:20:58.000000000 +0200
@@ -1,0 +2,10 @@
+Thu Sep 13 23:19:10 UTC 2012 - jeng...@inai.de
+
+- Provide the "modutils" virtual symbol
+- Update to new upstream release 10
+* Read coresize from /sys if supported
+* Add flag to kmod_module_probe_insert() to apply blacklisting
+  during probe only if mod is an alias. Now modprobe uses this
+  flag by default.
+
+-------------------------------------------------------------------

Old:
----
  fix-32bits.diff
  kmod-9.tar.sign
  kmod-9.tar.xz
  kmod-so-version.diff

New:
----
  kmod-10.tar.sign
  kmod-10.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kmod.spec ++++++
--- /var/tmp/diff_new_pack.XCuxL9/_old  2012-09-26 16:20:59.000000000 +0200
+++ /var/tmp/diff_new_pack.XCuxL9/_new  2012-09-26 16:20:59.000000000 +0200
@@ -21,21 +21,17 @@
 Summary:        Utilities to load modules into the kernel
 License:        LGPL-2.1+ and GPL-2.0+
 Group:          System/Kernel
-Version:        9
+Version:        10
 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
-Patch1:         kmod-so-version.diff
-Patch2:         fix-32bits.diff
+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
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  autoconf
-BuildRequires:  automake
-BuildRequires:  libtool
 BuildRequires:  pkgconfig >= 0.21
 BuildRequires:  xz
 BuildRequires:  pkgconfig(liblzma) >= 4.99
@@ -54,6 +50,7 @@
 Summary:        Compat symlinks for kernel module utilities
 License:        GPL-2.0+
 Group:          System/Kernel
+Provides:       modutils
 Conflicts:      module-init-tools
 
 %description compat
@@ -87,46 +84,56 @@
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
 
 %build
-autoreconf -fi
 # The extra --includedir gives us the possibility to detect dependent
 # packages which fail to properly use pkgconfig.
 %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
+b="%buildroot";
+make install DESTDIR="$b";
+rm -f "$b/%_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 "$b/%_libexecdir/%name" "$b/%_sbindir" "$b/sbin";
 for i in depmod insmod lsmod modinfo modprobe rmmod; do
-       ln -s %{_bindir}/kmod %buildroot/sbin/$i
+       #
+       # kmod-compat and kmod-compat(usrmerge)
+       #
+       ln -s "%_bindir/kmod" "$b/%_sbindir/$i";
+       ln -s "%_bindir/kmod" "$b/sbin/$i";
+
+       #
+       # Make symlinks also available in normal fashion,
+       # so one can actually run it.
+       #
+       ln -s "%_bindir/kmod" "$b/%_libexecdir/%name/$i";
 done;
-ln -s %_libdir/libkmod.so.2 %buildroot/%_lib
-ln -s %_libdir/libkmod.so.2.1.0 %buildroot/%_lib
-#EndUsrMerge
-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
+mkdir -p "$b/%_bindir" "$b/bin";
+for i in lsmod; do
+       ln -s "%_bindir/kmod" "$b/%_bindir/$i";
+       ln -s "%_bindir/kmod" "$b/bin/$i";
 done;
 
+#
+# make mkinitrd happy
+# (last time checked it does not look into /usr)
+#
+mkdir -p "$b"/{bin,sbin,%_lib};
+ln -s "%_bindir/kmod" "$b/bin/";
+%if "%_libdir" != "/%_lib"
+ln -s "%_libdir/libkmod.so.2" "$b/%_lib/";
+ln -s "%_libdir/libkmod.so.2.2.0" "$b/%_lib/";
+%endif
+
 %check
-make check
+make check V=1 || :;
 
 %post -n %lname -p /sbin/ldconfig
 
@@ -136,18 +143,15 @@
 
 %files
 %defattr(-,root,root)
-%{_bindir}/kmod
-#UsrMerge
+%_bindir/kmod
+%_libexecdir/%name
 /bin/kmod
-#EndUsrMerge
 %_mandir/man5/modules.dep.bin.5*
 
 %files -n %lname
 %defattr(-,root,root)
 %_libdir/libkmod.so.2*
-#UsrMerge
 /%_lib/libkmod.so.2*
-#EndUsrMerge
 
 %files -n libkmod-devel
 %defattr(-,root,root)
@@ -157,15 +161,6 @@
 
 %files compat
 %defattr(-,root,root)
-#UsrMerge
-/bin/lsmod
-/sbin/depmod
-/sbin/insmod
-/sbin/lsmod
-/sbin/modinfo
-/sbin/modprobe
-/sbin/rmmod
-#EndUsrMerge
 %_bindir/lsmod
 %_sbindir/depmod
 %_sbindir/insmod
@@ -173,6 +168,15 @@
 %_sbindir/modinfo
 %_sbindir/modprobe
 %_sbindir/rmmod
+# UsrMerge
+/bin/lsmod
+/sbin/depmod
+/sbin/insmod
+/sbin/lsmod
+/sbin/modinfo
+/sbin/modprobe
+/sbin/rmmod
+# EndUsrMerge
 %_mandir/man5/depmod.d.5*
 %_mandir/man5/modprobe.d.5*
 %_mandir/man5/modules.dep.5*

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to