Hello community, here is the log from the commit of package yast2-tv for openSUSE:Factory checked in at Fri Mar 27 00:42:39 CET 2009. -------- --- yast2-tv/yast2-tv.changes 2009-01-14 17:09:56.000000000 +0100 +++ yast2-tv/yast2-tv.changes 2009-03-26 08:25:53.091088000 +0100 @@ -1,0 +2,7 @@ +Thu Mar 26 08:20:36 CET 2009 - lslezak@suse.cz + +- Use /etc/modprobe.d/50-tv.conf config file instead of + /etc/modprobe.d/tv (bnc#485942) +- 2.18.1 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-tv-2.18.0.tar.bz2 New: ---- yast2-tv-2.18.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-tv.spec ++++++ --- /var/tmp/diff_new_pack.VK8118/_old 2009-03-27 00:42:11.000000000 +0100 +++ /var/tmp/diff_new_pack.VK8118/_new 2009-03-27 00:42:11.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-tv (Version 2.18.0) +# spec file for package yast2-tv (Version 2.18.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-tv -Version: 2.18.0 +Version: 2.18.1 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-tv-2.18.0.tar.bz2 +Source0: yast2-tv-2.18.1.tar.bz2 Prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-sound yast2-testsuite # .modprobe_blacklist agent @@ -51,7 +51,7 @@ Jan Holesovsky <kendy@suse.cz> %prep -%setup -n yast2-tv-2.18.0 +%setup -n yast2-tv-2.18.1 %build %{prefix}/bin/y2tool y2autoconf @@ -74,6 +74,12 @@ %clean rm -rf "$RPM_BUILD_ROOT" +%post +# rename the config file to the new modprobe schema +if test -e /etc/modprobe.d/tv; then + mv -f /etc/modprobe.d/tv /etc/modprobe.d/50-tv.conf +fi + %files %defattr(-,root,root) %dir /usr/share/YaST2/include/tv @@ -85,6 +91,10 @@ /usr/share/YaST2/data/*.ycp %doc %{prefix}/share/doc/packages/yast2-tv %changelog +* Thu Mar 26 2009 lslezak@suse.cz +- Use /etc/modprobe.d/50-tv.conf config file instead of + /etc/modprobe.d/tv (bnc#485942) +- 2.18.1 * Wed Jan 14 2009 ro@suse.de - re-add yast2-sound to buildrequires * Tue Jan 13 2009 lslezak@suse.cz ++++++ yast2-tv-2.18.0.tar.bz2 -> yast2-tv-2.18.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tv-2.18.0/agents/modprobe_tv.scr new/yast2-tv-2.18.1/agents/modprobe_tv.scr --- old/yast2-tv-2.18.0/agents/modprobe_tv.scr 2007-05-18 12:49:12.000000000 +0200 +++ new/yast2-tv-2.18.1/agents/modprobe_tv.scr 2009-03-26 08:24:55.000000000 +0100 @@ -18,7 +18,7 @@ * Write(.modules.options, $["agp_try_unsupported":"0"], "agpgart") * (true) * - * $Id: modprobe_tv.scr 17878 2004-06-16 14:44:33Z jsuchome $ + * $Id: modprobe_tv.scr 56404 2009-03-26 07:24:53Z lslezak $ * * <p>Reads/writes <tt>/etc/modprobe.conf/tv</tt>. For more detail see its * own documentation.</p> @@ -26,6 +26,6 @@ .modprobe_tv `ag_modules( - `ModulesConf("/etc/modprobe.d/tv") + `ModulesConf("/etc/modprobe.d/50-tv.conf") // `ModulesConf("/etc/modprobe.conf") ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tv-2.18.0/configure new/yast2-tv-2.18.1/configure --- old/yast2-tv-2.18.0/configure 2009-01-14 09:42:54.000000000 +0100 +++ new/yast2-tv-2.18.1/configure 2009-03-26 08:25:23.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yast2-tv 2.18.0. +# Generated by GNU Autoconf 2.63 for yast2-tv 2.18.1. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='yast2-tv' PACKAGE_TARNAME='yast2-tv' -PACKAGE_VERSION='2.18.0' -PACKAGE_STRING='yast2-tv 2.18.0' +PACKAGE_VERSION='2.18.1' +PACKAGE_STRING='yast2-tv 2.18.1' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1274,7 +1274,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-tv 2.18.0 to adapt to many kinds of systems. +\`configure' configures yast2-tv 2.18.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1345,7 +1345,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-tv 2.18.0:";; + short | recursive ) echo "Configuration of yast2-tv 2.18.1:";; esac cat <<\_ACEOF @@ -1425,7 +1425,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-tv configure 2.18.0 +yast2-tv configure 2.18.1 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1439,7 +1439,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-tv $as_me 2.18.0, which was +It was created by yast2-tv $as_me 2.18.1, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2286,7 +2286,7 @@ # Define the identity of the package. PACKAGE='yast2-tv' - VERSION='2.18.0' + VERSION='2.18.1' cat >>confdefs.h <<_ACEOF @@ -2510,7 +2510,7 @@ -VERSION="2.18.0" +VERSION="2.18.1" RPMNAME="yast2-tv" MAINTAINER="Ladislav Slezak <lslezak@suse.cz>" @@ -3451,7 +3451,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-tv $as_me 2.18.0, which was +This file was extended by yast2-tv $as_me 2.18.1, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3501,7 +3501,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -yast2-tv config.status 2.18.0 +yast2-tv config.status 2.18.1 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tv-2.18.0/configure.in new/yast2-tv-2.18.1/configure.in --- old/yast2-tv-2.18.0/configure.in 2009-01-14 09:42:50.000000000 +0100 +++ new/yast2-tv-2.18.1/configure.in 2009-03-26 08:25:19.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-tv, 2.18.0, http://bugs.opensuse.org/, yast2-tv) +AC_INIT(yast2-tv, 2.18.1, http://bugs.opensuse.org/, yast2-tv) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.18.0" +VERSION="2.18.1" RPMNAME="yast2-tv" MAINTAINER="Ladislav Slezak <lslezak@suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tv-2.18.0/src/Tv.ycp new/yast2-tv-2.18.1/src/Tv.ycp --- old/yast2-tv-2.18.0/src/Tv.ycp 2008-12-19 14:56:29.000000000 +0100 +++ new/yast2-tv-2.18.1/src/Tv.ycp 2009-03-26 08:24:55.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Data for configuration of tv, input and output functions. * Authors: Jan Holesovsky <kendy@suse.cz> * - * $Id: Tv.ycp 54297 2008-12-19 13:56:29Z lslezak $ + * $Id: Tv.ycp 56404 2009-03-26 07:24:53Z lslezak $ * * Representation of the configuration of TV cards. * Input and output routines. @@ -163,7 +163,7 @@ /** * This is true, if tv data were read from /etc/modprobe.conf - * On write, they shoud be removed and written only to /etc/modprobe.d/tv + * On write, they shoud be removed and written only to /etc/modprobe.d/50-tv.conf */ global boolean used_modprobe_conf = false; @@ -684,7 +684,7 @@ /** * Returns a list of all char-major-81-* in modprobe config file - * @param mod_path path to agent (using modprobe.conf or modprobe.d/tv) + * @param mod_path path to agent (using modprobe.conf or modprobe.d/50-tv.conf) * @return list List [ "char-major-81-0", "char-major-81-3" ] or so... */ define list<string> GetMajor81Aliases (path mod_path) ``{ @@ -700,7 +700,7 @@ /** * Returns a list of all char-major-212-* in modprobe config file - * @param mod_path path to agent (using modprobe.conf or modprobe.d/tv) + * @param mod_path path to agent (using modprobe.conf or modprobe.d/50-tv.conf) * @return list List [ "char-major-212-3" ] or so... */ define list<string> GetMajorInstalls(path mod_path) ``{ @@ -718,7 +718,7 @@ /** * Read parameters of one module. - * @param mod_path path to agent (using modprobe.conf or modprobe.d/tv) + * @param mod_path path to agent (using modprobe.conf or modprobe.d/50-tv.conf) * @param module_name Name of the module * @return map Map with parameters * @example @@ -786,16 +786,16 @@ /** * Reads saved TV cards data from given file - * @param mod_path path to agent (using modprobe.conf or modprobe.d/tv) + * @param mod_path path to agent (using modprobe.conf or modprobe.d/50-tv.conf) * @return list of TV cards */ define list read_modprobe (path mod_path) { if (mod_path == .modprobe_tv && - SCR::Read (.target.size, "/etc/modprobe.d/tv") == -1) + SCR::Read (.target.size, "/etc/modprobe.d/50-tv.conf") == -1) { - y2milestone ("creating /etc/modprobe.d/tv..."); - SCR::Execute (.target.bash, "/bin/touch /etc/modprobe.d/tv"); + y2milestone ("creating /etc/modprobe.d/50-tv.conf..."); + SCR::Execute (.target.bash, "/bin/touch /etc/modprobe.d/50-tv.conf"); return []; } @@ -807,7 +807,7 @@ list<string> tv_aliases = GetMajor81Aliases (mod_path); list<string> tv_installs = GetMajorInstalls(mod_path); - // the parameters read from modprobe.d/tv + // the parameters read from modprobe.d/50-tv.conf // $[ "module" : $[ parameter_name: $[ 0: nil, 1: "3", 2: "2" ] ] ] // no_of_the_card ----^-------^-------^ map modules_parameters = $[]; @@ -1666,7 +1666,7 @@ return ret; } - // initialize the blacklists from /etc/modprobe.d/blacklist file + // initialize the blacklists from /etc/modprobe.d/50-blacklist.conf file void LoadBlackList() { if (blacklisted_aliases == nil) @@ -1820,7 +1820,7 @@ */ define boolean WriteSettings() ``{ // common settings - y2debug ("Writing char-major-81 (videodev) to /etc/modprobe.d/tv"); + y2debug ("Writing char-major-81 (videodev) to /etc/modprobe.d/50-tv.conf"); SCR::Write (.modprobe_tv.alias."char-major-81", "videodev"); // fix of bug #18033: (slow initialization on some machines) @@ -1832,7 +1832,7 @@ }); if (used_modprobe_conf) { - y2milestone ("removing old tv configuration from /etc/modprobe.conf (it will be saved to /etc/modprobe.d/tv)"); + y2milestone ("removing old tv configuration from /etc/modprobe.conf (it will be saved to /etc/modprobe.d/50-tv.conf)"); // remove aliases from old config file foreach (string alias, GetMajor81Aliases (.modules), { SCR::Write (add (.modules.alias, alias) , nil); @@ -1867,7 +1867,7 @@ if (module_name == "") return; if (contains (SCR::Dir (.modprobe_tv.options), module_name)) { - y2milestone ("Deleting module %1 from /etc/modprobe.d/tv", + y2milestone ("Deleting module %1 from /etc/modprobe.d/50-tv.conf", module_name); // ... delete module's options from modprobe file SCR::Write (add (.modprobe_tv.options, module_name), nil); @@ -1949,7 +1949,7 @@ alias = sformat("char-major-212-%1", 64 * dvb_card_no + 3); } - y2milestone ("Writing alias %2 %1 to /etc/modprobe.d/tv", + y2milestone ("Writing alias %2 %1 to /etc/modprobe.d/50-tv.conf", module_names, alias); // modprobe comment @@ -2014,7 +2014,7 @@ ); // write comment with unique key and the card name - y2debug ("Writing comment to alias %1 in /etc/modprobe.d/tv", + y2debug ("Writing comment to alias %1 in /etc/modprobe.d/50-tv.conf", alias); path modpath = (size(module_names) > 1) ? .install : .alias; @@ -2037,7 +2037,7 @@ { // Error message popup, %1 is file name Report::Error (sformat (_("Unable to write parameters -to %1."), "/etc/modprobe.d/tv")); +to %1."), "/etc/modprobe.d/50-tv.conf")); result = false; } @@ -2054,7 +2054,7 @@ { // Error message popup, %1 is file name Report::Error (sformat (_("Unable to write %1."), - "/etc/modprobe.d/tv")); + "/etc/modprobe.d/50-tv.conf")); result = false; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tv-2.18.0/VERSION new/yast2-tv-2.18.1/VERSION --- old/yast2-tv-2.18.0/VERSION 2008-12-15 15:56:05.000000000 +0100 +++ new/yast2-tv-2.18.1/VERSION 2009-03-26 08:20:27.000000000 +0100 @@ -1 +1 @@ -2.18.0 +2.18.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org