commit yast2-tv for openSUSE:Factory
![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package yast2-tv for openSUSE:Factory checked in at Thu Feb 25 02:36:09 CET 2010. -------- --- yast2-tv/yast2-tv.changes 2010-01-14 15:52:15.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-tv/yast2-tv.changes 2010-02-24 15:56:51.000000000 +0100 @@ -0,0 +1,7 @@ +------------------------------------------------------------------- +Wed Feb 24 14:50:23 UTC 2010 - lslezak@suse.cz + +- don't display an error popup when lirc is not installed, + install it when needed (bnc#578406) +- 2.19.2 + calling whatdependson for head-i586 Old: ---- yast2-tv-2.19.1.tar.bz2 New: ---- yast2-tv-2.19.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-tv.spec ++++++ --- /var/tmp/diff_new_pack.HrMmys/_old 2010-02-25 02:36:05.000000000 +0100 +++ /var/tmp/diff_new_pack.HrMmys/_new 2010-02-25 02:36:05.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-tv (Version 2.19.1) +# spec file for package yast2-tv (Version 2.19.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,14 +19,18 @@ Name: yast2-tv -Version: 2.19.1 +Version: 2.19.2 Release: 1 + BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-tv-2.19.1.tar.bz2 +Source0: yast2-tv-2.19.2.tar.bz2 + Prefix: /usr + Group: System/YaST License: GPLv2+ BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-sound yast2-testsuite + # .modprobe_blacklist agent Requires: yast2-core >= 2.16.19 # GetInstArgs::automatic_configuration @@ -38,21 +42,25 @@ Obsoletes: yast2-lib-hardware Provides: yast2-trans-tv Obsoletes: yast2-trans-tv + BuildArch: noarch + Summary: YaST2 - TV Configuration %description This package contains the YaST2 component for TV card configuration. %prep -%setup -n yast2-tv-2.19.1 +%setup -n yast2-tv-2.19.2 %build %{prefix}/bin/y2tool y2autoconf %{prefix}/bin/y2tool y2automake autoreconf --force --install + export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" + %{?suse_update_config:%{suse_update_config -f}} ./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) ++++++ yast2-tv-2.19.1.tar.bz2 -> yast2-tv-2.19.2.tar.bz2 ++++++ ++++ 3309 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-tv-2.19.1/VERSION new/yast2-tv-2.19.2/VERSION --- old/yast2-tv-2.19.1/VERSION 2010-01-14 15:39:15.000000000 +0100 +++ new/yast2-tv-2.19.2/VERSION 2010-02-24 15:50:13.000000000 +0100 @@ -1 +1 @@ -2.19.1 +2.19.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-tv-2.19.1/configure.in new/yast2-tv-2.19.2/configure.in --- old/yast2-tv-2.19.1/configure.in 2010-01-14 15:53:45.000000000 +0100 +++ new/yast2-tv-2.19.2/configure.in 2010-02-24 15:54:23.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-tv, 2.19.1, http://bugs.opensuse.org/, yast2-tv) +AC_INIT(yast2-tv, 2.19.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.19.1" +VERSION="2.19.2" RPMNAME="yast2-tv" MAINTAINER="Ladislav Slezak <lslezak@suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-tv-2.19.1/src/Tv.ycp new/yast2-tv-2.19.2/src/Tv.ycp --- old/yast2-tv-2.19.1/src/Tv.ycp 2010-01-14 15:53:31.000000000 +0100 +++ new/yast2-tv-2.19.2/src/Tv.ycp 2010-02-24 15:54:14.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 60372 2010-01-14 14:53:30Z lslezak $ + * $Id: Tv.ycp 60996 2010-02-24 14:54:13Z lslezak $ * * Representation of the configuration of TV cards. * Input and output routines. @@ -283,6 +283,8 @@ // confirm installation of extra packages boolean confirm_packages = true; + global boolean lirc_installed = false; + // ------------------- function prototypes for include files: global define boolean IsDirty (); @@ -3134,6 +3136,14 @@ */ global define any ReadIRC () ``{ + if (!Package::InstalledAll(["lirc", "lirc-remotes"])) + { + y2warning("lirc and lirc-remotes are missing, not reading LIRC config"); + return `next; + } + + lirc_installed = true; + cards_with_ir_kbd_gpio = (map) SCR::Read (.target.yast2, "tv_cards-lirc_gpio.ycp"); @@ -3178,6 +3188,12 @@ */ global define any WriteIRC () ``{ + if (!lirc_installed) + { + y2warning("lirc is not installed, not writing lirc config"); + return `next; + } + if (SCR::Read(.target.size, "/etc/sysconfig/lirc") >= 0) { // write sysconfig values diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-tv-2.19.1/src/irc_ui.ycp new/yast2-tv-2.19.2/src/irc_ui.ycp --- old/yast2-tv-2.19.1/src/irc_ui.ycp 2009-04-03 11:59:06.000000000 +0200 +++ new/yast2-tv-2.19.2/src/irc_ui.ycp 2010-02-24 15:55:54.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: User interface functions. * Authors: Jiri Suchomel <jsuchome@novell.com> * - * $Id: irc_ui.ycp 56608 2009-04-03 09:59:05Z lslezak $ + * $Id: irc_ui.ycp 60999 2010-02-24 14:55:54Z lslezak $ * */ @@ -19,7 +19,8 @@ import "Tv"; import "Wizard"; import "Wizard_hw"; - +import "Message"; +import "Report"; include "tv/helps.ycp"; include "tv/misc.ycp"; @@ -330,14 +331,12 @@ use_irc = (ret == `yes); if (use_irc) { - boolean lirc_installed = Package::Installed ("lirc"); + boolean lirc_installed = Tv::lirc_installed; - if (!Package::InstallMsg ("lirc", - // popup label (install required application?) - _("Package 'lirc' is required for using infrared devices. -Install it now? -"))) + if (!lirc_installed && !Package::InstallAll(["lirc", "lirc-remotes"])) { + Report::Error(Message::FailedToInstallPackages()); + use_irc = false; UI::ChangeWidget (`id(`rd), `CurrentButton, `no); } @@ -347,6 +346,9 @@ { // the package has been just installed - make ini-agent reread the config file SCR::UnmountAgent(.sysconfig.lirc); + + // read IRC settings + Tv::ReadIRC(); } } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de