Hello community, here is the log from the commit of package module-init-tools checked in at Mon Oct 2 19:53:05 CEST 2006. -------- --- module-init-tools/module-init-tools.changes 2006-09-20 18:07:55.000000000 +0200 +++ /mounts/work_src_done/STABLE/module-init-tools/module-init-tools.changes 2006-10-02 19:43:42.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Oct 2 19:43:17 CEST 2006 - agruen@suse.de + +- Add support for depmod.conf from module-init-tools-3.3-pre2. + (This replaces our previous weak-updates patch.) + +------------------------------------------------------------------- Old: ---- module-init-tools-3.2.2-weak-updates.diff New: ---- depmod.conf-fix.diff depmod.conf-suse.diff depmod.conf.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ module-init-tools.spec ++++++ --- /var/tmp/diff_new_pack.4JfV8j/_old 2006-10-02 19:52:02.000000000 +0200 +++ /var/tmp/diff_new_pack.4JfV8j/_new 2006-10-02 19:52:02.000000000 +0200 @@ -13,7 +13,7 @@ Name: module-init-tools BuildRequires: dietlibc dietzlib Version: 3.2.2 -Release: 41 +Release: 44 %define ver 3.2.2 License: GPL Group: System/Kernel @@ -34,7 +34,6 @@ Patch3: %{name}-%{ver}-zlib.diff Patch4: %{name}-%{ver}-dump-modversions.diff Patch5: %{name}-%{ver}-modprobe-fastgetline.diff -Patch6: %{name}-%{ver}-weak-updates.diff Patch8: %{name}-%{ver}-blacklist-warn.diff Patch10: %{name}-%{ver}-eintr.diff Patch11: %{name}-%{ver}-use_blacklist.diff @@ -42,6 +41,9 @@ Patch13: %{name}-%{ver}-fmt.diff Patch14: %{name}-%{ver}-regex.diff Patch15: %{name}-%{ver}-options-priority.diff +Patch16: depmod.conf.diff +Patch17: depmod.conf-fix.diff +Patch18: depmod.conf-suse.diff Exclusiveos: Linux BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -70,7 +72,6 @@ %patch3 %patch4 %patch5 -%patch6 %patch10 %patch11 %patch12 @@ -78,6 +79,9 @@ %patch8 %patch14 %patch15 +%patch16 -p1 +%patch17 -p1 +%patch18 -p1 %build %{suse_update_config -f} @@ -148,6 +152,9 @@ /etc/modprobe.d %changelog -n module-init-tools +* Mon Oct 02 2006 - agruen@suse.de +- Add support for depmod.conf from module-init-tools-3.3-pre2. + (This replaces our previous weak-updates patch.) * Wed Sep 20 2006 - rguenther@suse.de - Remove docbook-utils and xmlcharent BuildRequires which both are not needed. ++++++ depmod.conf-fix.diff ++++++ Index: module-init-tools-3.2.2/depmod.c =================================================================== --- module-init-tools-3.2.2.orig/depmod.c +++ module-init-tools-3.2.2/depmod.c @@ -1114,6 +1114,7 @@ int main(int argc, char *argv[]) case 'u': case 'q': case 'r': + break; case 'C': config = optarg; break; ++++++ depmod.conf-suse.diff ++++++ Index: module-init-tools-3.2.2/depmod.c =================================================================== --- module-init-tools-3.2.2.orig/depmod.c +++ module-init-tools-3.2.2/depmod.c @@ -1181,8 +1181,10 @@ int main(int argc, char *argv[]) * list here. But only if there was no "search" option specified. */ - if (!search) + if (!search) { search = add_search("updates",search); + search = add_search("weak-updates",search); + } if (!all) { /* Do command line args. */ ++++++ depmod.conf.diff ++++++ ++++ 771 lines (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org