Hello community,
here is the log from the commit of package yast2-tv for openSUSE:Factory
checked in at Tue Apr 7 14:19:35 CEST 2009.
--------
--- yast2-tv/yast2-tv.changes 2009-03-26 08:25:53.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-tv/yast2-tv.changes 2009-04-03 12:20:56.369719000 +0200
@@ -1,0 +2,9 @@
+Fri Apr 3 10:02:21 CEST 2009 - lslezak@suse.cz
+
+- Do not try installing unavailable packages (TV applications)
+ (bnc #480179)
+- Display more details in lirc error popup, describe the details
+ (bnc#449327)
+- 2.18.2
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-tv-2.18.1.tar.bz2
New:
----
yast2-tv-2.18.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-tv.spec ++++++
--- /var/tmp/diff_new_pack.r21954/_old 2009-04-07 14:19:29.000000000 +0200
+++ /var/tmp/diff_new_pack.r21954/_new 2009-04-07 14:19:29.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-tv (Version 2.18.1)
+# spec file for package yast2-tv (Version 2.18.2)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-tv
-Version: 2.18.1
+Version: 2.18.2
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-tv-2.18.1.tar.bz2
+Source0: yast2-tv-2.18.2.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
%prep
-%setup -n yast2-tv-2.18.1
+%setup -n yast2-tv-2.18.2
%build
%{prefix}/bin/y2tool y2autoconf
@@ -91,6 +91,12 @@
/usr/share/YaST2/data/*.ycp
%doc %{prefix}/share/doc/packages/yast2-tv
%changelog
+* Fri Apr 03 2009 lslezak@suse.cz
+- Do not try installing unavailable packages (TV applications)
+ (bnc #480179)
+- Display more details in lirc error popup, describe the details
+ (bnc#449327)
+- 2.18.2
* Thu Mar 26 2009 lslezak@suse.cz
- Use /etc/modprobe.d/50-tv.conf config file instead of
/etc/modprobe.d/tv (bnc#485942)
@@ -369,7 +375,7 @@
- drop yast2-packager from NFB
* Mon Feb 23 2004 jsuchome@suse.cz
- minor fixes for NI
-* Sat Feb 07 2004 arvin@suse.de
+* Sun Feb 08 2004 arvin@suse.de
- removed config files (*.y2cc)
* Wed Feb 04 2004 jsuchome@suse.cz
- fixed testsuite
++++++ yast2-tv-2.18.1.tar.bz2 -> yast2-tv-2.18.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tv-2.18.1/configure new/yast2-tv-2.18.2/configure
--- old/yast2-tv-2.18.1/configure 2009-03-26 08:25:23.000000000 +0100
+++ new/yast2-tv-2.18.2/configure 2009-04-03 12:04:24.000000000 +0200
@@ -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.1.
+# Generated by GNU Autoconf 2.63 for yast2-tv 2.18.2.
#
# 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.1'
-PACKAGE_STRING='yast2-tv 2.18.1'
+PACKAGE_VERSION='2.18.2'
+PACKAGE_STRING='yast2-tv 2.18.2'
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.1 to adapt to many kinds of systems.
+\`configure' configures yast2-tv 2.18.2 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.1:";;
+ short | recursive ) echo "Configuration of yast2-tv 2.18.2:";;
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.1
+yast2-tv configure 2.18.2
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.1, which was
+It was created by yast2-tv $as_me 2.18.2, 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.1'
+ VERSION='2.18.2'
cat >>confdefs.h <<_ACEOF
@@ -2510,7 +2510,7 @@
-VERSION="2.18.1"
+VERSION="2.18.2"
RPMNAME="yast2-tv"
MAINTAINER="Ladislav Slezak "
@@ -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.1, which was
+This file was extended by yast2-tv $as_me 2.18.2, 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.1
+yast2-tv config.status 2.18.2
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.1/configure.in new/yast2-tv-2.18.2/configure.in
--- old/yast2-tv-2.18.1/configure.in 2009-03-26 08:25:19.000000000 +0100
+++ new/yast2-tv-2.18.2/configure.in 2009-04-03 12:04:19.000000000 +0200
@@ -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.1, http://bugs.opensuse.org/, yast2-tv)
+AC_INIT(yast2-tv, 2.18.2, 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.1"
+VERSION="2.18.2"
RPMNAME="yast2-tv"
MAINTAINER="Ladislav Slezak "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tv-2.18.1/src/irc_ui.ycp new/yast2-tv-2.18.2/src/irc_ui.ycp
--- old/yast2-tv-2.18.1/src/irc_ui.ycp 2008-01-10 10:32:56.000000000 +0100
+++ new/yast2-tv-2.18.2/src/irc_ui.ycp 2009-04-03 11:59:06.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: User interface functions.
* Authors: Jiri Suchomel
*
- * $Id: irc_ui.ycp 43515 2008-01-10 09:32:56Z lslezak $
+ * $Id: irc_ui.ycp 56608 2009-04-03 09:59:05Z lslezak $
*
*/
@@ -39,10 +39,10 @@
* start with temporary LIRC configuration to enable the test
* @return empty string on success, error message otherwise
*/
- define string lirc_tmp_start () ``{
+ define map lirc_tmp_start () ``{
if (!modified)
- return "";
+ return $[];
// store old configuration
orig_module = (string) SCR::Read (.sysconfig.lirc.LIRC_MODULE);
if (SCR::Read (.target.size, "/etc/lircd.conf") != -1)
@@ -69,7 +69,7 @@
out = (map) SCR::Execute (.target.bash_output, "rclirc restart");
else
out = (map) SCR::Execute (.target.bash_output, "rclirc start");
- return out["stderr"]:"";
+ return out;
}
/**
@@ -99,11 +99,11 @@
`Label(_("Initializing..."))
);
- string start = lirc_tmp_start ();
- if (start != "")
+ map start = lirc_tmp_start ();
+ if (start["exit"]:-1 != 0)
{
// error popup text
- ErrorWithDetails (_("Starting the 'lirc' service failed."), start);
+ ErrorWithDetails (_("Starting the 'lirc' service failed."), _("Output from /etc/init.d/lirc command:\n\n") + start["stdout"]:"" + "\n" + start["stderr"]:"");
UI::CloseDialog();
lirc_tmp_stop ();
return false;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tv-2.18.1/src/misc.ycp new/yast2-tv-2.18.2/src/misc.ycp
--- old/yast2-tv-2.18.1/src/misc.ycp 2007-05-18 12:49:12.000000000 +0200
+++ new/yast2-tv-2.18.2/src/misc.ycp 2009-04-03 11:59:06.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Miscelanous functions for configuration of tv.
* Authors: Jan Holesovsky
*
- * $Id: misc.ycp 15126 2004-03-01 18:52:37Z jsuchome $
+ * $Id: misc.ycp 56608 2009-04-03 09:59:05Z lslezak $
*
* Functions that are not UI related, do not belong to modules/tv.ycp
* and are not common enough to be in a library.
@@ -95,7 +95,7 @@
`VSpacing (0.5),
// label
`Left(`Heading (Label::ErrorMsg())),
- `Label (error),
+ `Left(`Label (error)),
`ReplacePoint (`id(`rp), `Empty()),
`VSpacing (0.5),
`Left(`CheckBox (`id(`details), `opt (`notify),
@@ -113,7 +113,7 @@
if (ret == `details)
{
if ((boolean)UI::QueryWidget (`id(`details), `Value))
- UI::ReplaceWidget (`id(`rp), `VBox (`Label (details)));
+ UI::ReplaceWidget (`id(`rp), `Frame(_("Details"), `Left(`Label (details))));
else
UI::ReplaceWidget (`id(`rp), `Empty());
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tv-2.18.1/src/Tv.ycp new/yast2-tv-2.18.2/src/Tv.ycp
--- old/yast2-tv-2.18.1/src/Tv.ycp 2009-03-26 08:24:55.000000000 +0100
+++ new/yast2-tv-2.18.2/src/Tv.ycp 2009-04-03 11:54:47.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Data for configuration of tv, input and output functions.
* Authors: Jan Holesovsky
*
- * $Id: Tv.ycp 56404 2009-03-26 07:24:53Z lslezak $
+ * $Id: Tv.ycp 56607 2009-04-03 09:54:46Z lslezak $
*
* Representation of the configuration of TV cards.
* Input and output routines.
@@ -317,7 +317,7 @@
* @param apps list of applications to install
* @param text text to show in dialog
*/
- define void InstallApplication (list apps, string text) ``{
+ define void InstallApplication (list<string> apps, string text) ``{
any ret = `ok;
@@ -346,22 +346,15 @@
if (ret == `ok)
{
- list<string> to_install = [];
- // check if packages are avialable...
- foreach (string app, (list<string>) apps, ``{
- if (Package::Available (app))
- to_install = add (to_install, app);
- });
-
if (ConfirmPackages())
{
// display a confirmation dialog
- Package::InstallAll(to_install);
+ Package::InstallAll(apps);
}
else
{
// do not ask the user, install the packages immediately
- Package::DoInstall(to_install);
+ Package::DoInstall(apps);
}
}
}
@@ -3590,35 +3583,48 @@
y2milestone("Detected TV card: %1, Radio card: %2", tv, radio);
- if (Package::Installed ("gnome-panel"))
- tv_app = "motv";
- else if (Package::Installed("kdelibs3") || Package::Installed("kdelibs4"))
- tv_app = "kdetv";
+ list<string> apps = [ ];
+ boolean kde = Package::Installed("kdelibs3") || Package::Installed("kdelibs4");
- boolean tv_app_installed = Package::Installed (tv_app);
- boolean radio_app_installed = Package::Installed ("kradio");
- list<string> apps = [ tv_app ];
-
- if (!Package::Installed("alevt"))
+ if (tv)
{
- apps = add(apps, "alevt");
+ if (Package::Installed ("gnome-panel"))
+ tv_app = "motv";
+ else if (kde)
+ {
+ tv_app = "kdetv";
+ }
+
+ if (!Package::Installed(tv_app) && Package::Available(tv_app) == true)
+ {
+ apps = add(apps, tv_app);
+ }
+
+ if (!Package::Installed("alevt") && Package::Available("alevt") == true)
+ {
+ apps = add(apps, "alevt");
+ }
+
+ if (!Package::Installed("nxtvepg") && Package::Available("nxtvepg") == true)
+ {
+ apps = add(apps, "nxtvepg");
+ }
+
+ y2milestone("TV packages to install: %1", apps);
}
- if (!Package::Installed("nxtvepg"))
+ if (radio && kde && !Package::Installed("kradio") && Package::Available("kradio") == true)
{
- apps = add(apps, "nxtvepg");
+ y2milestone("Adding kradio to the package list");
+ apps = add(apps, "kradio");
}
- y2milestone("TV application: %1, installed: %2", tv_app, tv_app_installed);
- y2milestone("Radio applications installed: %1", radio_app_installed);
- y2milestone("Applications to install: %1", apps);
+ y2milestone("Packages to install: %1", apps);
- // do not propose kradio application if we have not KDE
- if (radio && tv && !tv_app_installed && !radio_app_installed &&
- tv_app == "kdetv")
+ // installing radio and TV applications
+ if (contains(apps, "kradio") && size(apps) > 1)
{
// Popup text (required application are %1):
- apps = add (apps, "kradio");
InstallApplication (apps, sformat(_("<p>To enable you to watch TV and listen to radio on your computer,<br>
these packages should be installed:<br>
<b>%1</b><br>
@@ -3626,7 +3632,8 @@
</p>
"), mergestring (apps, ", ")));
}
- else if (tv && !tv_app_installed)
+ // installing only TV applications
+ else if (!contains(apps, "kradio") && size(apps) > 0)
{
// Popup text (required application are %1):
InstallApplication (apps, sformat(_("<p>To enable you to watch TV on your computer,<br>
@@ -3636,7 +3643,8 @@
</p>
"), mergestring (apps, ", ")));
}
- else if (radio && !radio_app_installed && tv_app == "kdetv")
+ // installing only radio application
+ else if (apps == ["kradio"])
{
// Popup text (required application is %1):
InstallApplication (["kradio"], sformat (_("<p>To listen to radio on your computer, you can use the <b>%1</b> application.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tv-2.18.1/VERSION new/yast2-tv-2.18.2/VERSION
--- old/yast2-tv-2.18.1/VERSION 2009-03-26 08:20:27.000000000 +0100
+++ new/yast2-tv-2.18.2/VERSION 2009-04-03 10:10:56.000000000 +0200
@@ -1 +1 @@
-2.18.1
+2.18.2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org