packages: module-init-tools/module-init-tools-insmod-zlib.patch, module-ini...

Tue Aug 11 09:06:34 CEST 2009

Author: arekm                        Date: Tue Aug 11 07:06:34 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 3.10

---- Files affected:
packages/module-init-tools:
   module-init-tools-insmod-zlib.patch (1.8 -> 1.9) , module-init-tools.spec (1.76 -> 1.77) 

---- Diffs:

================================================================
Index: packages/module-init-tools/module-init-tools-insmod-zlib.patch
diff -u packages/module-init-tools/module-init-tools-insmod-zlib.patch:1.8 packages/module-init-tools/module-init-tools-insmod-zlib.patch:1.9

--- packages/module-init-tools/module-init-tools-insmod-zlib.patch:1.8	Sun Apr 12 09:17:13 2009
+++ packages/module-init-tools/module-init-tools-insmod-zlib.patch	Tue Aug 11 09:06:29 2009
@@ -63,20 +63,21 @@
 @@ -1,6 +1,6 @@
  ACLOCAL_AMFLAGS = -I m4
  
--insmod_SOURCES = insmod.c util.c logging.c util.h logging.h testing.h
-+insmod_SOURCES = insmod.c util.c logging.c util.h logging.h testing.h zlibsupport.c zlibsupport.h
- lsmod_SOURCES = lsmod.c util.c logging.c util.h logging.h testing.h
- modprobe_SOURCES = modprobe.c util.c logging.c index.c zlibsupport.c config_filter.c util.h logging.h index.h testing.h zlibsupport.h config_filter.h
- rmmod_SOURCES = rmmod.c util.c logging.c util.h logging.h testing.h
-@@ -6,10 +6,8 @@
- modinfo_SOURCES = modinfo.c zlibsupport.c testing.h zlibsupport.h
- modindex_SOURCES = modindex.c logging.c index.c logging.h index.h
+-insmod_SOURCES = insmod.c testing.h
++insmod_SOURCES = insmod.c testing.h zlibsupport.c zlibsupport.h
+ lsmod_SOURCES = lsmod.c testing.h
+ modprobe_SOURCES = modprobe.c zlibsupport.c zlibsupport.h testing.h
+ rmmod_SOURCES = rmmod.c testing.h
+@@ -9,10 +9,10 @@
+ modinfo_SOURCES = modinfo.c zlibsupport.c zlibsupport.h testing.h
+ modindex_SOURCES = modindex.c zlibsupport.c zlibsupport.h testing.h
  
 -insmod_static_SOURCES = insmod.c
 +insmod_static_SOURCES = insmod.c logging.c zlibsupport.c zlibsupport.h
  insmod_static_LDFLAGS = -static
--# We don't want the $(zlib_flags) here: that makes a dynamic executable
--insmod_static_LDADD = 
+ # We don't want the $(zlib_flags) here: that makes a dynamic executable
+-insmod_static_LDADD = libmodtools.a
++insmod_static_LDADD = $(LDADD) libmodtools.a
  
- modprobe_LDADD = $(ZLIB)
- depmod_LDADD = $(ZLIB)
+ EXTRA_insmod_SOURCES =
+ EXTRA_lsmod_SOURCES =

================================================================
Index: packages/module-init-tools/module-init-tools.spec
diff -u packages/module-init-tools/module-init-tools.spec:1.76 packages/module-init-tools/module-init-tools.spec:1.77
--- packages/module-init-tools/module-init-tools.spec:1.76	Sun Apr 12 09:18:10 2009
+++ packages/module-init-tools/module-init-tools.spec	Tue Aug 11 09:06:29 2009
@@ -14,16 +14,15 @@
 Summary(tr.UTF-8):	Modül programları
 Summary(uk.UTF-8):	Утиліти для роботи з модулями ядра
 Name:		module-init-tools
-Version:	3.7
+Version:	3.10
 Release:	1
 License:	GPL v2+
 Group:		Applications/System
 Source0:	http://kernel.org/pub/linux/utils/kernel/module-init-tools/%{name}-%{version}.tar.bz2
-# Source0-md5:	7a30804543b28b030b6638e71ea21429
+# Source0-md5:	fcde0344ad07c4ae2ae6b40918fd092d
 Source1:	%{name}-blacklist
 Source2:	%{name}-usb
 Patch0:		%{name}-max.patch
-Patch1:		%{name}-shared-zlib.patch
 Patch2:		%{name}-insmod-zlib.patch
 Patch3:		%{name}-sparc.patch
 Patch4:		%{name}-modprobe_d.patch
@@ -69,9 +68,9 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
-%patch3 -p1
+# huh?
+# %patch3 -p1
 %patch4 -p1
 
 %build
@@ -94,19 +93,19 @@
 %endif
 
 %configure \
-	--enable-zlib
+	--enable-zlib-dynamic
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/etc/{cron.d,modprobe.d},%{_mandir}/man{5,8}}
 
-%{__make} install install-am \
+%{__make} -j1 install install-am \
 	DESTDIR=$RPM_BUILD_ROOT \
 	mandir=%{_mandir} \
 	INSTALL=install
 
-:> $RPM_BUILD_ROOT/etc/modprobe.conf
+:> $RPM_BUILD_ROOT/etc/modprobe.d/modprobe.conf
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/modprobe.d/blacklist.conf
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/modprobe.d/usb.conf
@@ -125,19 +124,22 @@
 
 %post
 if [ ! -s /etc/modprobe.conf -a -x /sbin/modprobe.modutils -a -f /etc/modules.conf ] && [ -d /lib/modules/`uname -r` ]; then
-	echo "Generating /etc/modprobe.conf from obsolete /etc/modules.conf"
-	%{_sbindir}/generate-modprobe.conf /etc/modprobe.conf
+	echo "Generating /etc/modprobe.d/modprobe.conf from obsolete /etc/modules.conf"
+	%{_sbindir}/generate-modprobe.conf /etc/modprobe.d/modprobe.conf
 fi
 
+%triggerun -- %{name} < 3.10
+[ -f /etc/modprobe.conf ] && mv /etc/modprobe.conf /etc/modprobe.d/modprobe.conf
+
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog NEWS README
-%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/modprobe.conf
 %dir /etc/modprobe.d
 %attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/modprobe.d/*.conf
 %attr(755,root,root) %{_sbindir}/*
 %{_mandir}/man5/depmod.conf.5*
 %{_mandir}/man5/modprobe.conf.5*
+%{_mandir}/man5/modprobe.d.5*
 %{_mandir}/man5/modules.dep.5*
 %{_mandir}/man8/*.8*
 
@@ -157,6 +159,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.77  2009/08/11 07:06:29  arekm
+- up to 3.10
+
 Revision 1.76  2009/04/12 07:18:10  arekm
 - builds now
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/module-init-tools/module-init-tools-insmod-zlib.patch?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/module-init-tools/module-init-tools.spec?r1=1.76&r2=1.77&f=u

