Hello community, here is the log from the commit of package kernel-source for openSUSE:12.1:Update:Test checked in at 2012-01-27 10:43:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/kernel-source (Old) and /work/SRC/openSUSE:12.1:Update:Test/.kernel-source.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kernel-source", Maintainer is "kernel-maintain...@forge.provo.novell.com" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/kernel-source/kernel-debug.changes 2012-01-23 14:54:04.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.kernel-source.new/kernel-debug.changes 2012-01-27 10:43:15.000000000 +0100 @@ -1,0 +2,13 @@ +Fri Jan 27 09:54:51 CET 2012 - mma...@suse.cz + +- rpm/kernel-binary.spec.in: Remove the conflict between the main and base + package again (bnc#743608) +- commit efb5ff4 + +------------------------------------------------------------------- +Tue Jan 24 16:30:36 CET 2012 - ti...@suse.de + +- Fix auto-mic of ALC268 static quirks (bnc#742322). +- commit d2fc232 + +------------------------------------------------------------------- kernel-default.changes: same change kernel-desktop.changes: same change kernel-docs.changes: same change kernel-ec2.changes: same change kernel-pae.changes: same change kernel-ppc64.changes: same change kernel-s390.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-trace.changes: same change kernel-vanilla.changes: same change kernel-xen.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.4laOvs/_old 2012-01-27 10:43:20.000000000 +0100 +++ /var/tmp/diff_new_pack.4laOvs/_new 2012-01-27 10:43:20.000000000 +0100 @@ -791,7 +791,6 @@ Url: http://www.kernel.org/ Provides: multiversion(kernel) Provides: kernel-base = %version-%source_rel -Conflicts: %name = %version-%release Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader kernel-default.spec: same change ++++++ kernel-desktop.spec ++++++ --- /var/tmp/diff_new_pack.4laOvs/_old 2012-01-27 10:43:20.000000000 +0100 +++ /var/tmp/diff_new_pack.4laOvs/_new 2012-01-27 10:43:20.000000000 +0100 @@ -131,7 +131,6 @@ %endif Provides: kernel = %version-%source_rel - Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 Source2: source-post.sh Source3: kernel-source.rpmlintrc @@ -282,8 +281,8 @@ that support it, regardless of the amount of main memory. %endif - %source_timestamp + %prep if ! [ -e %_sourcedir/linux-%srcversion.tar.bz2 ]; then echo "The %name-%version.nosrc.rpm package does not contain the" \ @@ -800,7 +799,6 @@ Url: http://www.kernel.org/ Provides: multiversion(kernel) Provides: kernel-base = %version-%source_rel -Conflicts: %name = %version-%release Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader @@ -827,8 +825,8 @@ This package contains only the base modules, required in all installs. - %source_timestamp + %preun base -f preun-base.sh %postun base -f postun-base.sh @@ -878,8 +876,8 @@ This package contains additional modules not supported by Novell. - %source_timestamp + %preun extra -f preun-extra.sh %postun extra -f postun-extra.sh ++++++ kernel-ec2.spec ++++++ --- /var/tmp/diff_new_pack.4laOvs/_old 2012-01-27 10:43:20.000000000 +0100 +++ /var/tmp/diff_new_pack.4laOvs/_new 2012-01-27 10:43:20.000000000 +0100 @@ -131,7 +131,6 @@ %endif Provides: kernel = %version-%source_rel - Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 Source2: source-post.sh Source3: kernel-source.rpmlintrc @@ -790,7 +789,6 @@ Url: http://www.kernel.org/ Provides: multiversion(kernel) Provides: kernel-base = %version-%source_rel -Conflicts: %name = %version-%release Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.4laOvs/_old 2012-01-27 10:43:20.000000000 +0100 +++ /var/tmp/diff_new_pack.4laOvs/_new 2012-01-27 10:43:20.000000000 +0100 @@ -797,7 +797,6 @@ Url: http://www.kernel.org/ Provides: multiversion(kernel) Provides: kernel-base = %version-%source_rel -Conflicts: %name = %version-%release Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader kernel-ppc64.spec: same change kernel-s390.spec: same change ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.4laOvs/_old 2012-01-27 10:43:21.000000000 +0100 +++ /var/tmp/diff_new_pack.4laOvs/_new 2012-01-27 10:43:21.000000000 +0100 @@ -24,11 +24,10 @@ Name: kernel-syms Summary: Kernel Symbol Versions (modversions) Version: 3.1.9 -%if %using_buildservice Release: 0 +%if %using_buildservice %else %define kernel_source_release %(LC_ALL=C rpm -q kernel-devel%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0) -Release: %kernel_source_release %endif License: GPL-2.0 Group: Development/Sources ++++++ kernel-trace.spec ++++++ --- /var/tmp/diff_new_pack.4laOvs/_old 2012-01-27 10:43:21.000000000 +0100 +++ /var/tmp/diff_new_pack.4laOvs/_new 2012-01-27 10:43:21.000000000 +0100 @@ -798,7 +798,6 @@ Url: http://www.kernel.org/ Provides: multiversion(kernel) Provides: kernel-base = %version-%source_rel -Conflicts: %name = %version-%release Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader kernel-vanilla.spec: same change ++++++ kernel-xen.spec ++++++ --- /var/tmp/diff_new_pack.4laOvs/_old 2012-01-27 10:43:21.000000000 +0100 +++ /var/tmp/diff_new_pack.4laOvs/_new 2012-01-27 10:43:21.000000000 +0100 @@ -131,7 +131,6 @@ %endif Provides: kernel = %version-%source_rel - Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 Source2: source-post.sh Source3: kernel-source.rpmlintrc @@ -790,7 +789,6 @@ Url: http://www.kernel.org/ Provides: multiversion(kernel) Provides: kernel-base = %version-%source_rel -Conflicts: %name = %version-%release Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader ++++++ kernel-binary.spec.in ++++++ --- /var/tmp/diff_new_pack.4laOvs/_old 2012-01-27 10:43:21.000000000 +0100 +++ /var/tmp/diff_new_pack.4laOvs/_new 2012-01-27 10:43:21.000000000 +0100 @@ -712,7 +712,6 @@ Url: http://www.kernel.org/ Provides: multiversion(kernel) Provides: kernel-base = %version-%source_rel -Conflicts: %name = %version-%release Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader ++++++ patches.drivers.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/alsa-hda-0003-alc268-quick-auto-mic-fix new/patches.drivers/alsa-hda-0003-alc268-quick-auto-mic-fix --- old/patches.drivers/alsa-hda-0003-alc268-quick-auto-mic-fix 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.drivers/alsa-hda-0003-alc268-quick-auto-mic-fix 2012-01-24 16:30:36.000000000 +0100 @@ -0,0 +1,32 @@ +From: Takashi Iwai <ti...@suse.de> +Subject: Fix auto-mic of ALC268 static quirks +Patch-mainline: Never +References: bnc#742322 + +Some static quirks for ALC268 contain the adc_nids and auto_mic set, +but the auto-mic mechanism isn't activated properly. This is a quick +fix for such cases. + +In the upstream, it's fixed differently, namely converting all to the +auto-parser. But it's too much change for openSUSE 12.1, so I'll take +this fix in the tree. + +Signed-off-by: Takashi Iwai <ti...@suse.de> + +--- + sound/pci/hda/patch_realtek.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -4372,6 +4372,10 @@ + alc_rebuild_imux_for_auto_mic(codec); + alc_remove_invalid_adc_nids(codec); + } ++ if (board_config != ALC_MODEL_AUTO && spec->auto_mic) { ++ alc_rebuild_imux_for_auto_mic(codec); ++ alc_auto_mic_check_imux(codec); ++ } + + if (!spec->no_analog && !spec->cap_mixer) + set_capture_mixer(codec); ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.4laOvs/_old 2012-01-27 10:43:21.000000000 +0100 +++ /var/tmp/diff_new_pack.4laOvs/_new 2012-01-27 10:43:21.000000000 +0100 @@ -656,6 +656,7 @@ ########################################################## patches.drivers/alsa-hda-0001-realtek-Fix-missing-volume-controls-with-ALC260 patches.drivers/alsa-hda-0002-Return-the-error-from-get_wcaps_type-for-in + patches.drivers/alsa-hda-0003-alc268-quick-auto-mic-fix ######################################################## # Char / serial ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.4laOvs/_old 2012-01-27 10:43:21.000000000 +0100 +++ /var/tmp/diff_new_pack.4laOvs/_new 2012-01-27 10:43:21.000000000 +0100 @@ -1,3 +1,3 @@ -2012-01-20 17:18:24 +0100 -GIT Revision: a0563d882122ef96bc5e727ed653825fa313f652 +2012-01-27 09:55:10 +0100 +GIT Revision: efb5ff410eab35d86ab48d359d3edf177b1d82d5 GIT Branch: openSUSE-12.1 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org