packages: module-init-tools/module-init-tools.spec, module-init-tools/modul...

Sun Aug 15 08:49:40 CEST 2010

Author: qboosh                       Date: Sun Aug 15 06:49:40 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added ac patch (update ax_enable_builddir.m4 to latest version - fixes build with current ac/am)
- more docs, verbose files

---- Files affected:
packages/module-init-tools:
   module-init-tools.spec (1.83 -> 1.84) , module-init-tools-ac.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/module-init-tools/module-init-tools.spec
diff -u packages/module-init-tools/module-init-tools.spec:1.83 packages/module-init-tools/module-init-tools.spec:1.84

--- packages/module-init-tools/module-init-tools.spec:1.83	Sun Aug 16 23:00:38 2009
+++ packages/module-init-tools/module-init-tools.spec	Sun Aug 15 08:49:34 2010
@@ -23,6 +23,7 @@
 Source1:	%{name}-blacklist
 Source2:	%{name}-usb
 Patch0:		%{name}-max.patch
+Patch1:		%{name}-ac.patch
 Patch2:		%{name}-insmod-zlib.patch
 Patch3:		%{name}-sparc.patch
 Patch4:		%{name}-modprobe_d.patch
@@ -69,6 +70,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 %patch2 -p1
 # huh?
 # %patch3 -p1
@@ -141,15 +143,28 @@
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog NEWS README
+%doc AUTHORS ChangeLog FAQ NEWS README TODO
 %dir /etc/modprobe.d
-%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/modprobe.d/*.conf
-%attr(755,root,root) %{_sbindir}/*
+%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/modprobe.d/blacklist.conf
+%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/modprobe.d/modprobe.conf
+%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/modprobe.d/usb.conf
+%attr(755,root,root) %{_sbindir}/depmod
+%attr(755,root,root) %{_sbindir}/insmod
+%attr(755,root,root) %{_sbindir}/insmod.static
+%attr(755,root,root) %{_sbindir}/lsmod
+%attr(755,root,root) %{_sbindir}/modinfo
+%attr(755,root,root) %{_sbindir}/modprobe
+%attr(755,root,root) %{_sbindir}/rmmod
 %{_mandir}/man5/depmod.conf.5*
 %{_mandir}/man5/modprobe.conf.5*
 %{_mandir}/man5/modprobe.d.5*
 %{_mandir}/man5/modules.dep.5*
-%{_mandir}/man8/*.8*
+%{_mandir}/man8/depmod.8*
+%{_mandir}/man8/insmod.8*
+%{_mandir}/man8/lsmod.8*
+%{_mandir}/man8/modinfo.8*
+%{_mandir}/man8/modprobe.8*
+%{_mandir}/man8/rmmod.8*
 
 %if %{with initrd}
 %files initrd
@@ -167,6 +182,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.84  2010/08/15 06:49:34  qboosh
+- added ac patch (update ax_enable_builddir.m4 to latest version - fixes build with current ac/am)
+- more docs, verbose files
+
 Revision 1.83  2009/08/16 21:00:38  arekm
 - rel 2: add C rc-scripts < 0.4.2.4
 

================================================================
Index: packages/module-init-tools/module-init-tools-ac.patch
diff -u /dev/null packages/module-init-tools/module-init-tools-ac.patch:1.1
--- /dev/null	Sun Aug 15 08:49:40 2010
+++ packages/module-init-tools/module-init-tools-ac.patch	Sun Aug 15 08:49:34 2010
@@ -0,0 +1,58 @@
+--- module-init-tools-3.10/m4/ax_enable_builddir.m4.orig	2009-06-23 09:36:25.000000000 +0200
++++ module-init-tools-3.10/m4/ax_enable_builddir.m4	2010-08-15 08:37:32.506824134 +0200
+@@ -1,5 +1,5 @@
+ # ===========================================================================
+-#           http://autoconf-archive.cryp.to/ax_enable_builddir.html
++#    http://www.gnu.org/software/autoconf-archive/ax_enable_builddir.html
+ # ===========================================================================
+ #
+ # SYNOPSIS
+@@ -48,11 +48,7 @@
+ #   tarball from the builddir to the sourcedir (or $(PUB)) for reason of
+ #   convenience.
+ #
+-# LAST MODIFICATION
+-#
+-#   2009-03-09
+-#
+-# COPYLEFT
++# LICENSE
+ #
+ #   Copyright (c) 2009 Guido U. Draheim <guidod at gmx.de>
+ #   Copyright (c) 2009 Alan Jenkins <alan-jenkins at tuffmail.co.uk>
+@@ -79,9 +75,11 @@
+ #   all other use of the material that constitutes the Autoconf Macro.
+ #
+ #   This special exception to the GPL applies to versions of the Autoconf
+-#   Macro released by the Autoconf Macro Archive. When you make and
+-#   distribute a modified version of the Autoconf Macro, you may extend this
+-#   special exception to the GPL to apply to your modified version as well.
++#   Macro released by the Autoconf Archive. When you make and distribute a
++#   modified version of the Autoconf Macro, you may extend this special
++#   exception to the GPL to apply to your modified version as well.
++
++#serial 19
+ 
+ AC_DEFUN([AX_ENABLE_BUILDDIR],[
+ AC_REQUIRE([AC_CANONICAL_HOST])[]dnl
+@@ -92,7 +90,7 @@
+ AS_VAR_PUSHDEF([AUX],[ax_enable_builddir_auxdir])dnl
+ AS_VAR_PUSHDEF([SED],[ax_enable_builddir_sed])dnl
+ SUB="."
+-AC_ARG_ENABLE([builddir], AC_HELP_STRING(
++AC_ARG_ENABLE([builddir], AS_HELP_STRING(
+   [--disable-builddir],[disable automatic build in subdir of sources])
+   ,[SUB="$enableval"], [SUB="auto"])
+ if test ".$ac_srcdir_defaulted" != ".no" ; then
+@@ -187,8 +185,9 @@
+ s/^top_srcdir *=.*/top_srcdir = ./
+ /[[:=]]/!d
+ /^\\./d
+-dnl Now handle rules (i.e. lines containing /:/ but not /:=/).
+-/:=/b
++dnl Now handle rules (i.e. lines containing ":" but not " = ").
++/ = /b
++/ .= /b
+ /:/!b
+ s/:.*/:/
+ s/ /  /g
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/module-init-tools/module-init-tools.spec?r1=1.83&r2=1.84&f=u

