Hello community,
here is the log from the commit of package yast2-tv
checked in at Fri Aug 24 00:10:15 CEST 2007.
--------
--- yast2-tv/yast2-tv.changes 2007-06-06 11:26:32.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-tv/yast2-tv.changes 2007-08-23 10:16:22.495297000 +0200
@@ -1,0 +2,9 @@
+Thu Aug 23 09:14:16 CEST 2007 - lslezak@suse.cz
+
+- don't read/write hwcfg files, remove the old files from
+ previous versions (#303713)
+- fixed build (FindStaticHWConfig() has been removed from
+ yast2-sound)
+- 2.15.7
+
+-------------------------------------------------------------------
Old:
----
yast2-tv-2.15.6.tar.bz2
New:
----
yast2-tv-2.15.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-tv.spec ++++++
--- /var/tmp/diff_new_pack.wZ8599/_old 2007-08-24 00:09:53.000000000 +0200
+++ /var/tmp/diff_new_pack.wZ8599/_new 2007-08-24 00:09:53.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-tv (Version 2.15.6)
+# spec file for package yast2-tv (Version 2.15.7)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-tv
-Version: 2.15.6
+Version: 2.15.7
Release: 1
-License: GNU General Public License (GPL)
+License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-tv-2.15.6.tar.bz2
+Source0: yast2-tv-2.15.7.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
%ifnarch s390 s390x
@@ -42,7 +42,7 @@
Jan Holesovsky
%prep
-%setup -n yast2-tv-2.15.6
+%setup -n yast2-tv-2.15.7
%build
%{prefix}/bin/y2tool y2autoconf
@@ -77,6 +77,12 @@
%doc %{prefix}/share/doc/packages/yast2-tv
%changelog
+* Thu Aug 23 2007 - lslezak@suse.cz
+- don't read/write hwcfg files, remove the old files from
+ previous versions (#303713)
+- fixed build (FindStaticHWConfig() has been removed from
+ yast2-sound)
+- 2.15.7
* Wed Jun 06 2007 - lslezak@suse.cz
- support for ivtv based TV cards (#130098)
- install firmware/packages before loading drivers
++++++ yast2-tv-2.15.6.tar.bz2 -> yast2-tv-2.15.7.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tv-2.15.6/configure new/yast2-tv-2.15.7/configure
--- old/yast2-tv-2.15.6/configure 2007-06-06 11:22:44.000000000 +0200
+++ new/yast2-tv-2.15.7/configure 2007-08-23 10:09:20.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2-tv 2.15.6.
+# Generated by GNU Autoconf 2.60 for yast2-tv 2.15.7.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-tv'
PACKAGE_TARNAME='yast2-tv'
-PACKAGE_VERSION='2.15.6'
-PACKAGE_STRING='yast2-tv 2.15.6'
+PACKAGE_VERSION='2.15.7'
+PACKAGE_STRING='yast2-tv 2.15.7'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1181,7 +1181,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.15.6 to adapt to many kinds of systems.
+\`configure' configures yast2-tv 2.15.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1252,7 +1252,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-tv 2.15.6:";;
+ short | recursive ) echo "Configuration of yast2-tv 2.15.7:";;
esac
cat <<\_ACEOF
@@ -1330,7 +1330,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-tv configure 2.15.6
+yast2-tv configure 2.15.7
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1344,7 +1344,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.15.6, which was
+It was created by yast2-tv $as_me 2.15.7, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2145,7 +2145,7 @@
# Define the identity of the package.
PACKAGE='yast2-tv'
- VERSION='2.15.6'
+ VERSION='2.15.7'
cat >>confdefs.h <<_ACEOF
@@ -2372,7 +2372,7 @@
-VERSION="2.15.6"
+VERSION="2.15.7"
RPMNAME="yast2-tv"
MAINTAINER="Ladislav Slezak "
@@ -3258,7 +3258,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.15.6, which was
+This file was extended by yast2-tv $as_me 2.15.7, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3301,7 +3301,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-tv config.status 2.15.6
+yast2-tv config.status 2.15.7
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tv-2.15.6/configure.in new/yast2-tv-2.15.7/configure.in
--- old/yast2-tv-2.15.6/configure.in 2007-06-06 11:22:38.000000000 +0200
+++ new/yast2-tv-2.15.7/configure.in 2007-08-23 10:09:14.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-tv, 2.15.6, http://bugs.opensuse.org/, yast2-tv)
+AC_INIT(yast2-tv, 2.15.7, http://bugs.opensuse.org/, yast2-tv)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.15.6"
+VERSION="2.15.7"
RPMNAME="yast2-tv"
MAINTAINER="Ladislav Slezak "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tv-2.15.6/src/Tv.ycp new/yast2-tv-2.15.7/src/Tv.ycp
--- old/yast2-tv-2.15.6/src/Tv.ycp 2007-06-06 11:16:25.000000000 +0200
+++ new/yast2-tv-2.15.7/src/Tv.ycp 2007-08-23 10:09:04.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Data for configuration of tv, input and output functions.
* Authors: Jan Holesovsky
*
- * $Id: Tv.ycp 38305 2007-06-06 09:16:24Z lslezak $
+ * $Id: Tv.ycp 40422 2007-08-23 08:09:13Z lslezak $
*
* Representation of the configuration of TV cards.
* Input and output routines.
@@ -28,6 +28,7 @@
import "Package";
import "Sound";
import "WizardHW";
+ import "HWConfig";
textdomain "tv";
@@ -1604,6 +1605,54 @@
return file;
}
+
+ /**
+ * Removes all hwcfg files created by this module (they are not needed anymore)
+ */
+ define boolean RemoveHWConfigTV() {
+ boolean ret = true;
+
+ // get list of all config files
+ list<string> cfiles = HWConfig::ConfigFiles();
+ y2milestone("Found sysconfig/hardware files: %1", cfiles);
+
+ if (size(cfiles) > 0)
+ {
+ boolean changed = false;
+
+ // scan each config file - search for sound card config
+ foreach(string cfile, cfiles, {
+ string com = HWConfig::GetComment(cfile, "MODULE");
+
+ if (com != nil)
+ {
+ list<string> coms = splitstring(com, "\n");
+
+ foreach(string comline, coms, {
+ // this is a hwconfig file crated by Yast
+ // we can safely remove it
+ if (regexpmatch(comline, "^# YaST configured TV card"))
+ {
+ y2milestone("Removing file: %1", cfile);
+ ret = HWConfig::RemoveConfig(cfile) && ret;
+ changed = true;
+ }
+ }
+ );
+ }
+ });
+
+ if (changed)
+ {
+ // apply the changes
+ HWConfig::Flush();
+ }
+ }
+
+ return ret;
+ }
+
+
/**
* Write the TV settings to the SCR.
* @return boolean Was the reading successful?
@@ -1696,32 +1745,11 @@
);
}
}
-
- // remove hwcfg file
- string uniq = card["unique_key"]:"";
- string bus = busmap[uniq]:"";
-
- if (bus != nil && bus != "")
- {
- string file = "bus-" + bus;
- y2milestone("Removing hwcfg file: %1", file);
- // remove the hwcfg file
- HWConfig::RemoveConfig(file);
- }
- else
- {
- // search for static hwcfg file
- string staticconf = FindStaticHWConfig(uniq);
- if (staticconf != nil && staticconf != "")
- {
- // there is a static config file, remove it
- y2milestone("Removing hwcfg file: %1", staticconf);
- // remove the hwcfg file
- HWConfig::RemoveConfig(staticconf);
- }
- }
});
+ // remove hwcfg files (not needed anymore)
+ RemoveHWConfigTV();
+
boolean result = true;
// save the status (configured/unconfigured)
@@ -1735,9 +1763,8 @@
// no_of_the_card ----^-------^-------^
map modules_parameters = $[];
- // remember all created hwconfig files
- // $["sysconfig_name" : "card_name"]
- map hwconfigfiles = $[];
+ // commands to start the devices $[ "device_name" : "commmand" ]
+ list