November 2012 - openSUSE Commits - openSUSE Mailing Lists

commit rpmlint-mini for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '12

02 Nov '12

Hello community, here is the log from the commit of package rpmlint-mini for openSUSE:Factory checked in at 2012-11-02 19:39:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpmlint-mini (Old) and /work/SRC/openSUSE:Factory/.rpmlint-mini.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rpmlint-mini", Maintainer is "DMueller(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/rpmlint-mini/rpmlint-mini.changes 2012-09-13 00:06:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rpmlint-mini.new/rpmlint-mini.changes 2012-11-02 19:39:39.000000000 +0100 @@ -1,0 +2,10 @@ +Sun Oct 28 09:06:47 UTC 2012 - coolo(a)suse.com + +- fix build by passing rpmlint :) + +------------------------------------------------------------------- +Sun Oct 28 05:33:05 UTC 2012 - coolo(a)suse.com + +- let it require cpio - the same as with rpmlint + +------------------------------------------------------------------- New: ---- rpmlint-mini.rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpmlint-mini.spec ++++++ --- /var/tmp/diff_new_pack.YbMat7/_old 2012-11-02 19:39:46.000000000 +0100 +++ /var/tmp/diff_new_pack.YbMat7/_new 2012-11-02 19:39:46.000000000 +0100 @@ -30,6 +30,7 @@ BuildRequires: dash BuildRequires: libtool BuildRequires: polkit-default-privs +Requires: cpio Summary: Rpm correctness checker License: GPL-2.0+ Group: System/Packages @@ -42,18 +43,12 @@ Source101: rpmlint.wrapper Source102: rpmlint-mini.config Source103: polkit-default-privs.config +Source1000: rpmlint-mini.rpmlintrc %description Rpmlint is a tool to check common errors on rpm packages. Binary and source packages can be checked. - - -Authors: --------- - Frederic Lepied <flepied(a)mandriva.com> - Gwenole Beauchesne <gbeauchesne(a)mandriva.com> - %prep %setup -q -n desktop-file-utils-0.20 [[ -r COPYING ]] @@ -98,8 +93,12 @@ cp -a %_bindir/rpmlint $RPM_BUILD_ROOT/opt/testing/share/rpmlint/rpmlint.py pushd $RPM_BUILD_ROOT/opt/testing/share/rpmlint PYTHONOPTIMIZE=1 python %py_libdir/py_compile.py *.py +rm *.py +popd +pushd $RPM_BUILD_ROOT/opt/testing/%{_lib}/python%{py_ver}/site-packages/ +PYTHONOPTIMIZE=1 python %py_libdir/py_compile.py *.py +rm *.py popd -rm -f $RPM_BUILD_ROOT/opt/testing/share/rpmlint/*.py rm -rf $RPM_BUILD_ROOT/{usr,etc} rm -f $RPM_BUILD_ROOT/opt/testing/bin/rpmlint install -m 755 -D %{SOURCE101} $RPM_BUILD_ROOT/opt/testing/bin/rpmlint ++++++ rpmlint-mini.rpmlintrc ++++++ addFilter("library-without-ldconfig") addFilter("python-bytecode-without-source") addFilter("devel-file-in-non-devel-package") -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rubygem-builder for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '12

02 Nov '12

Hello community, here is the log from the commit of package rubygem-builder for openSUSE:Factory checked in at 2012-11-02 19:39:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-builder (Old) and /work/SRC/openSUSE:Factory/.rubygem-builder.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-builder", Maintainer is "JMassaguerPla(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-builder/rubygem-builder.changes 2012-09-25 10:47:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-builder.new/rubygem-builder.changes 2012-11-02 19:39:37.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Oct 26 15:56:26 UTC 2012 - coolo(a)suse.com + +- updated to version 3.1.4 + * just a small test fix + +------------------------------------------------------------------- Old: ---- builder-3.1.3.gem New: ---- builder-3.1.4.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-builder.spec ++++++ --- /var/tmp/diff_new_pack.GGFUYF/_old 2012-11-02 19:39:39.000000000 +0100 +++ /var/tmp/diff_new_pack.GGFUYF/_new 2012-11-02 19:39:39.000000000 +0100 @@ -17,7 +17,7 @@ Name: rubygem-builder -Version: 3.1.3 +Version: 3.1.4 Release: 0 %define mod_name builder %define mod_full_name %{mod_name}-%{version} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit chromium for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '12

02 Nov '12

Hello community, here is the log from the commit of package chromium for openSUSE:Factory checked in at 2012-11-02 19:38:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/chromium (Old) and /work/SRC/openSUSE:Factory/.chromium.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "chromium", Maintainer is "PRusnak(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/chromium/chromium.changes 2012-10-16 21:31:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.chromium.new/chromium.changes 2012-11-02 19:38:58.000000000 +0100 @@ -1,0 +2,11 @@ +Fri Oct 26 08:58:02 UTC 2012 - tittiatcoke(a)gmail.com + +- Update to 24.0.1308 + * Updated V8 - 3.14.5.0 + * Bookmarks are now searched by their title while typing into + the omnibox with matching bookmarks being shown in the + autocomplete suggestions pop-down list. Matching is done by + prefix. + * Fixed chromium issues 155871, 154173, 155133. + +------------------------------------------------------------------- Old: ---- chromium-6.0.425.0-ffmpeg-no-pkgconfig.patch chromium.24.0.1290.0.svn160607.tar.bz2 New: ---- chromium-ffmpeg-no-pkgconfig.patch chromium.24.0.1308.0.svn164291.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ chromium.spec ++++++ --- /var/tmp/diff_new_pack.LC0cAu/_old 2012-11-02 19:39:36.000000000 +0100 +++ /var/tmp/diff_new_pack.LC0cAu/_new 2012-11-02 19:39:36.000000000 +0100 @@ -16,10 +16,10 @@ # -%define svn_revision 160607 +%define svn_revision 164291 Name: chromium -Version: 24.0.1290.0 +Version: 24.0.1308.0 Release: 0 Summary: Google's opens source browser project License: BSD-3-Clause and LGPL-2.1+ @@ -54,7 +54,7 @@ # PATCH-FIX-OPENSUSE enables reading of the master preference Patch14: chromium-master-prefs-path.patch # PATCH-FIX-OPENSUSE disables the requirement for ffmpeg -Patch20: chromium-6.0.425.0-ffmpeg-no-pkgconfig.patch +Patch20: chromium-ffmpeg-no-pkgconfig.patch # PATCH-FIX-OPENSUSE remove the rpath in the libraries Patch62: chromium-norpath.patch # PATCH-FIX-UPSTREAM Add more charset aliases ++++++ chromium-ffmpeg-no-pkgconfig.patch ++++++ diff -up chromium-6.0.425.0-20100603svn48830/third_party/ffmpeg/ffmpeg.gyp.BAD chromium-6.0.425.0-20100603svn48830/third_party/ffmpeg/ffmpeg.gyp --- chromium-6.0.425.0-20100603svn48830/src/third_party/ffmpeg/ffmpeg.gyp.BAD 2010-06-03 13:48:45.196313786 -0400 +++ chromium-6.0.425.0-20100603svn48830/src/third_party/ffmpeg/ffmpeg.gyp 2010-06-03 13:50:10.580325776 -0400 @@ -501,12 +501,14 @@ # Add pkg-config result to include path when use_system_ffmpeg != 0 ['use_system_ffmpeg != 0', { - 'cflags': [ - '<!@(pkg-config --cflags libavcodec libavformat libavutil)', + 'include_dirs': [ + 'chromium/config/<(ffmpeg_branding)/<(os_config)/<(ffmpeg_config)', + '.', ], 'direct_dependent_settings': { - 'cflags': [ - '<!@(pkg-config --cflags libavcodec libavformat libavutil)', + 'include_dirs': [ + 'chromium/config/<(ffmpeg_branding)/<(os_config)/<(ffmpeg_config)', + '.', ], }, }, { # else use_system_ffmpeg == 0, add local copy to include path ++++++ chromium-vendor.patch.in ++++++ --- /var/tmp/diff_new_pack.LC0cAu/_old 2012-11-02 19:39:37.000000000 +0100 +++ /var/tmp/diff_new_pack.LC0cAu/_new 2012-11-02 19:39:37.000000000 +0100 @@ -1,6 +1,6 @@ --- src/webkit/user_agent/user_agent_util.cc +++ src/webkit/user_agent/user_agent_util.cc -@@ -169,7 +169,7 @@ +@@ -173,7 +173,7 @@ std::string user_agent; base::StringAppendF( &user_agent, ++++++ chromium.24.0.1290.0.svn160607.tar.bz2 -> chromium.24.0.1308.0.svn164291.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/chromium/chromium.24.0.1290.0.svn160607.tar.bz2 /work/SRC/openSUSE:Factory/.chromium.new/chromium.24.0.1308.0.svn164291.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-installation for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '12

02 Nov '12

Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at 2012-11-02 17:44:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old) and /work/SRC/openSUSE:Factory/.yast2-installation.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-installation", Maintainer is "jsuchome(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes 2012-10-26 17:38:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes 2012-11-02 17:44:53.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Oct 31 08:16:46 CET 2012 - jsuchome(a)suse.cz + +- removed fonts_finish, its only action was to call obsolete + SuSEconfig script +- removed inst_suseconfig client (fate#100011) +- 2.23.2 + +------------------------------------------------------------------- Old: ---- yast2-installation-2.23.1.tar.bz2 New: ---- yast2-installation-2.23.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.yEbBK9/_old 2012-11-02 17:44:55.000000000 +0100 +++ /var/tmp/diff_new_pack.yEbBK9/_new 2012-11-02 17:44:55.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 2.23.1 +Version: 2.23.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-installation-2.23.1.tar.bz2 -> yast2-installation-2.23.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.23.1/VERSION new/yast2-installation-2.23.2/VERSION --- old/yast2-installation-2.23.1/VERSION 2012-10-26 08:45:49.000000000 +0200 +++ new/yast2-installation-2.23.2/VERSION 2012-10-31 08:19:28.000000000 +0100 @@ -1 +1 @@ -2.23.1 +2.23.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.23.1/src/clients/inst_automatic_configuration.ycp new/yast2-installation-2.23.2/src/clients/inst_automatic_configuration.ycp --- old/yast2-installation-2.23.1/src/clients/inst_automatic_configuration.ycp 2012-06-25 11:05:52.000000000 +0200 +++ new/yast2-installation-2.23.2/src/clients/inst_automatic_configuration.ycp 2012-10-26 11:01:04.000000000 +0200 @@ -65,14 +65,6 @@ y2milestone ("automatic_configuration started"); -// list <map <string, any> > proposal_scripts_to_call = [ -// $[ -// "label":_("Finishing configuration..."), -// "type":"scripts", -// "items":["addon_update_sources", "inst_extrasources", "suseconfig", "save_hardware_status"] -// ], -// ]; - list <map <string, any> > proposal_scripts_to_call = []; map <string, any> globals_features = ProductFeatures::GetSection ("globals"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.23.1/src/clients/inst_finish.ycp new/yast2-installation-2.23.2/src/clients/inst_finish.ycp --- old/yast2-installation-2.23.1/src/clients/inst_finish.ycp 2012-06-25 11:05:52.000000000 +0200 +++ new/yast2-installation-2.23.2/src/clients/inst_finish.ycp 2012-10-31 08:14:46.000000000 +0100 @@ -154,7 +154,6 @@ (Mode::live_installation() ? "live_save_config":""), "runlevel", "desktop", - "fonts", "storage", "iscsi-client", "kernel", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.23.1/src/clients/inst_suseconfig.ycp new/yast2-installation-2.23.2/src/clients/inst_suseconfig.ycp --- old/yast2-installation-2.23.1/src/clients/inst_suseconfig.ycp 2012-06-25 11:05:52.000000000 +0200 +++ new/yast2-installation-2.23.2/src/clients/inst_suseconfig.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,282 +0,0 @@ -/* ------------------------------------------------------------------------------ - * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. - * - * - * This program is free software; you can redistribute it and/or modify it under - * the terms of version 2 of the GNU General Public License as published by the - * Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, contact Novell, Inc. - * - * To contact Novell about this file by physical or electronic mail, you may find - * current contact information at www.novell.com. - * ------------------------------------------------------------------------------ - */ - -/** - * File: clients/inst_suseconfig.ycp - * Package: Installation - * Summary: Run SUSEconfig - * Authors: Andreas Schwab <schwab(a)suse.de> - * Stefan Hundhammer <sh(a)suse.de> - * - * $Id$ - * - * Purpose: - * - shows the "Finishing the installation" frame - * - runs "SuSEconfig" - * - runs "init" to reread inittab, which has been changed by SuSEconfig. - * - shows the loginname which can be used. - */ - -{ - - textdomain "installation"; - - import "Arch"; - import "Directory"; - import "Installation"; - import "Mode"; - import "Stage"; - import "Popup"; - import "Wizard"; - import "Kernel"; - import "GetInstArgs"; - - // bugzilla #241553 comment #7 - // import "Product"; // ugly, because of initializing the &product; macro - - if ( GetInstArgs::going_back()) // going backwards? - return `auto; // don't execute this once more - - // automatic configuration has its own progress - // do not set an UI if possible - boolean automatic_configuration = GetInstArgs::automatic_configuration(); - y2milestone ("Script AutoConf: %1", automatic_configuration); - - boolean reread_inittab = false; - - integer current_step = 0; // Required by logStep() - - string log_destination = ">> " + Directory::logdir + "/y2log.SuSEconfig"; // Required by doStep() - - if ( Stage::cont () ) - { - reread_inittab = true; - } - - /** - * Display a step in the LogView widget and increment the progress bar. - * Uses global variable 'current_step'. - * - * @param step_descr description of the step. - */ - define void logStep( string step_descr ) ``{ - current_step = current_step + 1; - - if (! automatic_configuration && !Mode::commandline ()) { - UI::ChangeWidget( `id(`progress), `Value, current_step ); - UI::ChangeWidget( `id(`log), `LastLine, step_descr + "\n" ); - } - }; - - - /** - * Run a step on the target and log its output to the globally specified - * 'log_destination'. - * - * @param step command to execute in this step - */ - define void runStep( string step ) ``{ - - string command = sformat( "HOME=%1 %2 %3 2>&1", Directory::tmpdir, step, log_destination ); - // Setting $HOME to Directory::tmpdir to avoid cluttering '/' with spurious files - bug #13204 - - // automatic configuration doesn't have UI - // the very same approach uses testsuite - if (Mode::test () && ! automatic_configuration) - { - y2milestone( "Test mode - NOT executing '%1'", command ); - sleep( 300 ); - } - else - { - y2milestone( "Executing '%1'", command ); - SCR::Execute( .target.bash, command ); - } - }; - - - //////////////////////////////////////////////////////////////////////////////// - // Main Dialog - //////////////////////////////////////////////////////////////////////////////// - - - /* Help text for SUSEconfig dialog */ - string help = _("<p><tt>SuSEconfig</tt> must write the configuration -of your &product; system. Depending on the CPU and the amount of memory, -this process can take some time.</p> -"); - - // BNC #429146 - list <string> tmp_modules = (list<string>) SCR::Read (.target.dir, "/sbin/conf.d/"); - list <string> modules = []; - integer counter = -1; - - foreach (string one_module, tmp_modules, { - if (! regexpmatch (one_module, "^SuSEconfig\\.")) - return; - - if (regexpmatch (one_module, "\\.(swp|bak|sav|save|orig|rpmorig|rpmsave|rpmnew)$")) - return; - - one_module = regexpsub (one_module, "^SuSEconfig\\.(.*)", "\\1"); - counter = counter + 1; - modules[counter] = one_module; - }); - - y2milestone ("SuSEconfig scripts to call: %1", modules); - - integer max_steps = size( modules ) + 1; // + ldconfig - - if ( reread_inittab ) - { - max_steps = max_steps + 1; // restart 'init' - } - - term contents = `VBox( - `LogView(`id(`log), "", 10, 0 ), - - // Progress bar that displays overall progress in this dialog - `ProgressBar(`id(`progress), _("Progress"), max_steps, 0 ) - ); - - if (! automatic_configuration && !Mode::commandline ()) { - Wizard::SetContents( - // Dialog title for SuSEconfig dialog - _("Writing the system configuration..."), - contents, help, GetInstArgs::enable_back(), GetInstArgs::enable_next()); - Wizard::DisableAbortButton(); - } - - - // -------------------------------------------------------------- - // Put config of installed kernel into kernel sources - - y2debug( "Testmode: %1", Mode::test () ); - - // - // Preliminary 'ldconfig' - this takes a long time at first run. - // - // SusEconfig calls this internally, too, but we want to avoid giving the - // impression the very first SuSEconfig module takes that long: It's - // simply not true, it's 'ldconfig' that takes this long. So make this fact - // transparent by explicitly calling it (and informing the user about that) - // prior to calling any SuSEconfig module. - // - - logStep( _("Setting up linker cache...") ); - runStep( "/sbin/ldconfig" ); - - // This is the same as: - // runStep( "/sbin/SuSEconfig --verbose --module aaa_at_first" ); - // but that "aaa_at_first" module will go away soon. Or so it is said. ;-) - - - if ( Stage::initial () || Stage::cont () - || tolower( (string) SCR::Read(.sysconfig.suseconfig.ENABLE_SUSECONFIG) ) == "yes" ) - { - // - // Call each SuSEconfig module individually - // - - foreach (string mod, modules, ``{ - // inform user about current SuSEconfig step - logStep( sformat (_("Running SuSEconfig.%1"), mod)); - runStep( "/sbin/SuSEconfig --verbose --module " + mod ); - }); - - if (! Mode::test () && ! automatic_configuration) - { - SCR::Execute (.target.remove, "/var/lib/YaST2/run_suseconfig"); - } - - - // - // Call "all the rest" of the SuSEconfig main program - // - - // inform user that SuSEconfig has finished - logStep( _("Finishing SuSEconfig") ); - runStep( "/sbin/SuSEconfig --verbose --nomodule" ); - } - else - { - // inform user that SuSEconfig has been disabled - logStep( _("SuSEconfig disabled in /etc/sysconfig/suseconfig") ); - y2milestone( "SuSEconfig disabled in /etc/sysconfig/suseconfig" ); - } - - - - // - // Tell init to reread inittab which might have been changed by SuSEconfig. - // - - if ( reread_inittab ) - { - runStep( "/sbin/init q" ); - } - - - // The final LogView line to be displayed after SuSEconfig etc. is done. - if (!automatic_configuration && !Mode::commandline ()) - UI::ChangeWidget( `id(`log), `LastLine, "\n" + _("Done.") + "\n" ); - - - if (Mode::test () && ! automatic_configuration && !Mode::commandline ()) - { - UI::MakeScreenShot(); // doesn't work manually - not widget with keyboard focus! - sleep( 5*1000 ); - } - - if ( Kernel::GetInformAboutKernelChange () ) - { - // inform the user that he/she has to reboot to activate new kernel - Popup::Message(_("Reboot your system -to activate the new kernel. -")); - } - - // ... - // Migrate configuration from XFree86 3.x to XFree86 4.x - // if possible - // --- - if ( Mode::update () ) - { - if (SCR::Read(.target.size, "/etc/X11/XF86Config")!= -1) { - integer flag = (integer) - SCR::Execute (.target.bash, - "/usr/bin/tail -n 1 /etc/X11/XF86Config | grep -q '#3x'" - ); - if (flag == 0) - { - SCR::Execute (.target.bash, Directory::ybindir + "/xmigrate.pl"); - } - } - } - - if ( Mode::update () ) - { - return `next; - } - else - { - return `auto; - } -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.23.1/src/inst_finish/fonts_finish.ycp new/yast2-installation-2.23.2/src/inst_finish/fonts_finish.ycp --- old/yast2-installation-2.23.1/src/inst_finish/fonts_finish.ycp 2012-06-25 11:05:52.000000000 +0200 +++ new/yast2-installation-2.23.2/src/inst_finish/fonts_finish.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,88 +0,0 @@ -/* ------------------------------------------------------------------------------ - * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. - * - * - * This program is free software; you can redistribute it and/or modify it under - * the terms of version 2 of the GNU General Public License as published by the - * Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, contact Novell, Inc. - * - * To contact Novell about this file by physical or electronic mail, you may find - * current contact information at www.novell.com. - * ------------------------------------------------------------------------------ - */ - -/** - * File: - * fonts_finish.ycp - * - * Module: - * Step of base installation finish - * - * Authors: - * Jiri Srain <jsrain(a)suse.cz> - * - * $Id$ - * - */ - -{ - -textdomain "installation"; - -import "FileUtils"; - -any ret = nil; -string func = ""; -map param = $[]; - -/* Check arguments */ -if(size(WFM::Args()) > 0 && is(WFM::Args(0), string)) { - func = (string)WFM::Args(0); - if(size(WFM::Args()) > 1 && is(WFM::Args(1), map)) - param = (map)WFM::Args(1); -} - -y2milestone ("starting fonts_finish"); -y2debug("func=%1", func); -y2debug("param=%1", param); - -if (func == "Info") -{ - return (any)$[ - "steps" : 1, - // progress step title - "title" : _("Initializing fonts..."), - "when" : [ `installation, `update, `autoinst ], - ]; -} -else if (func == "Write") -{ - // Always run fonts_finish::Write - // skip it if SuSEconfig.fonts doesn't exist - // bugzilla #216079 - if (FileUtils::Exists ("/sbin/conf.d/SuSEconfig.fonts")) { - if (SCR::Execute (.target.bash, "/sbin/SuSEconfig --module fonts") != 0) - y2error ("SuSEconfig --module fonts failed"); - } else { - y2warning ("Script /sbin/conf.d/SuSEconfig.fonts doesn't exist, skipping..."); - } -} -else -{ - y2error ("unknown function: %1", func); - ret = nil; -} - -y2debug("ret=%1", ret); -y2milestone("fonts_finish finished"); -return ret; - - -} /* EOF */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.23.1/src/inst_finish/installation_settings_finish.ycp new/yast2-installation-2.23.2/src/inst_finish/installation_settings_finish.ycp --- old/yast2-installation-2.23.1/src/inst_finish/installation_settings_finish.ycp 2012-06-25 11:05:52.000000000 +0200 +++ new/yast2-installation-2.23.2/src/inst_finish/installation_settings_finish.ycp 2012-10-26 11:07:22.000000000 +0200 @@ -102,16 +102,6 @@ } - // bnc #390930 - // Since there is no second stage during upgrade, SuSEConfig has to be run - // by hooks - if (Mode::update()) { - y2milestone ("Creating hook-file %1", InstData::suseconfig_hookfile); - if ((boolean) SCR::Write (.target.string, InstData::suseconfig_hookfile, "")) { - y2error ("Cannot write suseconfig hook-file"); - } - } - y2milestone ("Anyway, successful"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.23.1/src/modules/InstData.ycp new/yast2-installation-2.23.2/src/modules/InstData.ycp --- old/yast2-installation-2.23.1/src/modules/InstData.ycp 2012-06-25 11:05:52.000000000 +0200 +++ new/yast2-installation-2.23.2/src/modules/InstData.ycp 2012-10-26 11:06:29.000000000 +0200 @@ -74,10 +74,6 @@ // this variable enables a check box in dialog global boolean enable_autoconfiguration = false; - // file that forces suseconfig run on boot - // bnc #390930 - global string suseconfig_hookfile = Directory::vardir + "/run_suseconfig"; - // <-- other // --> copy files -- config -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2 for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '12

02 Nov '12

Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2012-11-02 17:44:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2", Maintainer is "jsrain(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2012-10-31 07:04:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2012-11-02 17:44:25.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Nov 2 11:43:01 CET 2012 - jsuchome(a)suse.cz + +- move Log Viewer client here from dropped repair module + (bnc#787070) +- 2.23.11 + +------------------------------------------------------------------- Old: ---- yast2-2.23.10.tar.bz2 New: ---- yast2-2.23.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.Q0zlDB/_old 2012-11-02 17:44:27.000000000 +0100 +++ /var/tmp/diff_new_pack.Q0zlDB/_new 2012-11-02 17:44:27.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2 -Version: 2.23.10 +Version: 2.23.11 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -239,6 +239,7 @@ #system %dir /usr/share/YaST2/include/hwinfo /usr/share/YaST2/include/hwinfo/*.ycp +%{_prefix}/share/applications/YaST2/messages.desktop # documentation ++++++ yast2-2.23.10.tar.bz2 -> yast2-2.23.11.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.23.10/VERSION new/yast2-2.23.11/VERSION --- old/yast2-2.23.10/VERSION 2012-10-30 08:00:46.000000000 +0100 +++ new/yast2-2.23.11/VERSION 2012-11-02 11:43:42.000000000 +0100 @@ -1 +1 @@ -2.23.10 +2.23.11 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.23.10/configure new/yast2-2.23.11/configure --- old/yast2-2.23.10/configure 2012-10-30 08:05:18.000000000 +0100 +++ new/yast2-2.23.11/configure 2012-11-02 11:57:19.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for yast2 2.23.10. +# Generated by GNU Autoconf 2.69 for yast2 2.23.11. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='yast2' PACKAGE_TARNAME='yast2' -PACKAGE_VERSION='2.23.10' -PACKAGE_STRING='yast2 2.23.10' +PACKAGE_VERSION='2.23.11' +PACKAGE_STRING='yast2 2.23.11' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1250,7 +1250,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 2.23.10 to adapt to many kinds of systems. +\`configure' configures yast2 2.23.11 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1321,7 +1321,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2 2.23.10:";; + short | recursive ) echo "Configuration of yast2 2.23.11:";; esac cat <<\_ACEOF @@ -1401,7 +1401,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2 configure 2.23.10 +yast2 configure 2.23.11 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1418,7 +1418,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 $as_me 2.23.10, which was +It was created by yast2 $as_me 2.23.11, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2357,7 +2357,7 @@ # Define the identity of the package. PACKAGE='yast2' - VERSION='2.23.10' + VERSION='2.23.11' cat >>confdefs.h <<_ACEOF @@ -2480,7 +2480,7 @@ -VERSION="2.23.10" +VERSION="2.23.11" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" @@ -3522,7 +3522,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2 $as_me 2.23.10, which was +This file was extended by yast2 $as_me 2.23.11, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3575,7 +3575,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2 config.status 2.23.10 +yast2 config.status 2.23.11 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.23.10/configure.in new/yast2-2.23.11/configure.in --- old/yast2-2.23.10/configure.in 2012-10-30 08:05:14.000000000 +0100 +++ new/yast2-2.23.11/configure.in 2012-11-02 11:57:16.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2 dnl -dnl -- This file is generated by y2autoconf 2.23.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.23.1 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2, 2.23.10, http://bugs.opensuse.org/, yast2) +AC_INIT(yast2, 2.23.11, http://bugs.opensuse.org/, yast2) 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.23.10" +VERSION="2.23.11" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.23.10/library/modules/Version.ycp new/yast2-2.23.11/library/modules/Version.ycp --- old/yast2-2.23.10/library/modules/Version.ycp 2012-10-30 08:05:24.000000000 +0100 +++ new/yast2-2.23.11/library/modules/Version.ycp 2012-11-02 11:57:25.000000000 +0100 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.23.10"; +global string yast2 = "2.23.11"; /* EOF */ } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.23.10/library/system/src/Makefile.am new/yast2-2.23.11/library/system/src/Makefile.am --- old/yast2-2.23.10/library/system/src/Makefile.am 2012-10-18 10:31:39.000000000 +0200 +++ new/yast2-2.23.11/library/system/src/Makefile.am 2012-11-02 11:55:33.000000000 +0100 @@ -1,12 +1,15 @@ # Makefile.am for yast2/library/modules -#module_DATA = HWConfig.ycp Initrd.ycp Kernel.ycp ModuleLoading.ycp ModulesConf.ycp Hotplug.ycp HwStatus.ycp module_DATA = $(wildcard [A-Z]*.ycp) yncludedir = @yncludedir@/hwinfo ynclude_DATA = classnames.ycp -EXTRA_DIST = $(module_DATA) $(ynclude_DATA) +client_DATA = view_anymsg.ycp + +desktop_DATA = messages.desktop + +EXTRA_DIST = $(module_DATA) $(ynclude_DATA) $(client_DATA) $(desktop_DATA) YCPCFLAGS = -M ../../wizard/src -M ../../modules -M ../../types/src -M ../../types/src diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.23.10/library/system/src/Makefile.in new/yast2-2.23.11/library/system/src/Makefile.in --- old/yast2-2.23.10/library/system/src/Makefile.in 2012-10-30 08:05:22.000000000 +0100 +++ new/yast2-2.23.11/library/system/src/Makefile.in 2012-11-02 11:57:23.000000000 +0100 @@ -100,9 +100,11 @@ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(modulebindir)" \ +am__installdirs = "$(DESTDIR)$(clientdir)" "$(DESTDIR)$(desktopdir)" \ + "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(modulebindir)" \ "$(DESTDIR)$(yncludedir)" -DATA = $(module_DATA) $(modulebin_DATA) $(ynclude_DATA) +DATA = $(client_DATA) $(desktop_DATA) $(module_DATA) $(modulebin_DATA) \ + $(ynclude_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -224,11 +226,11 @@ ydatadir = @ydatadir@ yncludedir = @yncludedir@/hwinfo ystartupdir = @ystartupdir@ - -#module_DATA = HWConfig.ycp Initrd.ycp Kernel.ycp ModuleLoading.ycp ModulesConf.ycp Hotplug.ycp HwStatus.ycp module_DATA = $(wildcard [A-Z]*.ycp) ynclude_DATA = classnames.ycp -EXTRA_DIST = $(module_DATA) $(ynclude_DATA) +client_DATA = view_anymsg.ycp +desktop_DATA = messages.desktop +EXTRA_DIST = $(module_DATA) $(ynclude_DATA) $(client_DATA) $(desktop_DATA) YCPCFLAGS = -M ../../wizard/src -M ../../modules -M ../../types/src -M ../../types/src modulebin_DATA = $(patsubst %.ycp,%.ybc,$(module_DATA)) modulebindir = $(moduledir) @@ -277,6 +279,48 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +install-clientDATA: $(client_DATA) + @$(NORMAL_INSTALL) + @list='$(client_DATA)'; test -n "$(clientdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(clientdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(clientdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(clientdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(clientdir)" || exit $$?; \ + done + +uninstall-clientDATA: + @$(NORMAL_UNINSTALL) + @list='$(client_DATA)'; test -n "$(clientdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(clientdir)'; $(am__uninstall_files_from_dir) +install-desktopDATA: $(desktop_DATA) + @$(NORMAL_INSTALL) + @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(desktopdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(desktopdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(desktopdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(desktopdir)" || exit $$?; \ + done + +uninstall-desktopDATA: + @$(NORMAL_UNINSTALL) + @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir) install-moduleDATA: $(module_DATA) @$(NORMAL_INSTALL) @list='$(module_DATA)'; test -n "$(moduledir)" || list=; \ @@ -386,7 +430,7 @@ check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(modulebindir)" "$(DESTDIR)$(yncludedir)"; do \ + for dir in "$(DESTDIR)$(clientdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(modulebindir)" "$(DESTDIR)$(yncludedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -441,8 +485,8 @@ info-am: -install-data-am: install-moduleDATA install-modulebinDATA \ - install-yncludeDATA +install-data-am: install-clientDATA install-desktopDATA \ + install-moduleDATA install-modulebinDATA install-yncludeDATA install-dvi: install-dvi-am @@ -486,22 +530,25 @@ ps-am: -uninstall-am: uninstall-moduleDATA uninstall-modulebinDATA \ +uninstall-am: uninstall-clientDATA uninstall-desktopDATA \ + uninstall-moduleDATA uninstall-modulebinDATA \ uninstall-yncludeDATA .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic dist-hook \ distclean distclean-generic distdir dvi dvi-am html html-am \ - info info-am install install-am install-data install-data-am \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-moduleDATA install-modulebinDATA \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip install-yncludeDATA installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \ - uninstall-am uninstall-moduleDATA uninstall-modulebinDATA \ + info info-am install install-am install-clientDATA \ + install-data install-data-am install-desktopDATA install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-moduleDATA install-modulebinDATA install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + install-yncludeDATA installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-clientDATA uninstall-desktopDATA \ + uninstall-moduleDATA uninstall-modulebinDATA \ uninstall-yncludeDATA diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.23.10/library/system/src/messages.desktop new/yast2-2.23.11/library/system/src/messages.desktop --- old/yast2-2.23.10/library/system/src/messages.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-2.23.11/library/system/src/messages.desktop 2012-11-02 11:41:21.000000000 +0100 @@ -0,0 +1,25 @@ +[Desktop Entry] +Type=Application +Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Misc; + +X-KDE-ModuleType=Library +X-KDE-RootOnly=true +X-KDE-HasReadOnlyMode=true +X-KDE-Library=yast2 +X-SuSE-YaST-Call=view_anymsg + +X-SuSE-YaST-Group=Misc +X-SuSE-YaST-Argument=/var/log/messages +X-SuSE-YaST-RootOnly=true +X-SuSE-YaST-AutoInst= +X-SuSE-YaST-Geometry= +X-SuSE-YaST-SortKey= +X-SuSE-YaST-AutoInstResource= + +Icon=yast-messages +Exec=/sbin/yast2 view_anymsg /var/log/messages + +Name=System Log +GenericName=Display the system's log (/var/log/messages) +X-KDE-SubstituteUID=true +StartupNotify=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.23.10/library/system/src/view_anymsg.ycp new/yast2-2.23.11/library/system/src/view_anymsg.ycp --- old/yast2-2.23.10/library/system/src/view_anymsg.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-2.23.11/library/system/src/view_anymsg.ycp 2012-11-02 11:41:08.000000000 +0100 @@ -0,0 +1,242 @@ +/* + * view_anymsg.ycp + * + * small script for easy /var/log/* and /proc/* viewing + * + * Author: Klaus Kaempf <kkaempf(a)suse.de> + * + * $Id$ + * + * Reads a \n separated list of filenames from + * /var/lib/YaST2/filenames + * Lines starting with "#" are ignored (comments) + * A line starting with "*" is taken as the default filename, the "*" is stripped + * + * All files are listed in an editable combo box, where the user can + * easily switch between files and even add a new file + * + * At finish, the list of filenames is written back to + * /var/lib/YaST2/filenames + * adapting the default line (starting with "*") accordingly. + * + * The default is either given as WFM::Args(0) or is the file last viewed. + */ + +{ + textdomain "repair"; + + import "CommandLine"; + import "Directory"; + import "FileUtils"; + import "Label"; + + string vardir = Directory::vardir; + + // Check if the filename list is present + if (!FileUtils::Exists (vardir + "/filenames")) + { + SCR::Execute(.target.bash, "/bin/cp " + Directory::ydatadir + "/filenames " + vardir + "/filenames"); + } + + // get filename list + string filenames = (string) SCR::Read(.target.string, vardir + "/filenames"); + if ((filenames == nil) + || (size (filenames) <= 0)) + { + filenames = "/var/log/boot.msg\n/var/log/messages\n"; + } + + // convert \n separated string to ycp list. + + list<string> all_files = splitstring (filenames, "\n"); + + boolean set_default = false; + list<term> combo_files = []; + + // check if default given as argument + + string filename = ""; + if ((size(WFM::Args()) > 0) + && is(WFM::Args(0), string)) + { + filename = (string)WFM::Args(0); + if (filename != "") + { + combo_files = [ `item(`id(filename), filename, true) ]; + set_default = true; + } + } + + /* the command line description map */ + map cmdline = $[ + "id" : "view_anymsg", + ]; + if (filename == "help") return CommandLine::Run (cmdline); + + // build up ComboBox + + foreach (string name, all_files, + { + // empty lines or lines starting with "#" are ignored + if (name != "" + && substring (name, 0, 1) != "#") + { + // the default is either given via WFM::Args() -> filename != "" + // or by a filename starting with "*" + if (substring (name, 0, 1) == "*") + { + name = substring (name, 1); // strip leading "*" + if (name != filename) // do not add it twice + { + combo_files = + add (combo_files,`item (`id(name),name, !set_default)); + } + if (!set_default) + { + if (filename == "") + filename = name; + set_default = true; + } + } + else if (name != filename) // do not add it twice + { + combo_files = add (combo_files, `item(`id(name), name)); + } + } + }); + + if (!set_default + && (filename != "")) + { + all_files = add (all_files, "*" + filename); + combo_files = add (combo_files, `item(`id(filename), filename)); + } + + // set up dialogue + + UI::OpenDialog( `opt(`decorated, `defaultsize ), + `VBox( + `HSpacing( 70 ), // force width + `HBox (`HSpacing (1.0), `ComboBox (`id(`custom_file), `opt(`editable, `notify, `hstretch), "", combo_files), `HStretch()), + `VSpacing( 0.3 ), + `VWeight( 1, + `HBox( + `VSpacing( 18 ), // force height + `HSpacing( 0.7 ), + `LogView( `id(`log ), + "", + 3, // height + 0 ), // number of lines to show + `HSpacing( 0.7 ) + ) + ), + `VSpacing( 0.3 ), + `PushButton( `id(`ok), Label::OKButton() ), + `VSpacing( 0.3 ) + ) + ); + + + string file_contents = ""; + boolean go_on = true; + + // wait until user clicks "OK" + // check if ComboBox selected and change view accordingly + + while (go_on) + { + // read file contents + file_contents = (string)SCR::Read (.target.string, filename); + + // Fill the LogView with file contents + UI::ChangeWidget( `id(`log ), `Value, file_contents ); + + string heading = sformat( _("System Log (%1)"), filename ); + UI::ChangeWidget( `id(`log ), `Label, heading); + + // wait for user input + + symbol ret = (symbol)UI::UserInput(); + + // clicked "OK" -> exit + + if (ret == `ok) + { + go_on = false; + } + else if (ret == `cancel) // close window + { + UI::CloseDialog(); + return true; + } + else if (ret == `custom_file) + { + // adapt to combo box settings + + string new_file = (string)UI::QueryWidget(`id(`custom_file), `Value); + if (new_file != nil) + { + filename = new_file; + } + } + else + { + y2milestone ("bad UserInput (%1)", ret); + } + } + + // write new list of filenames + + list<string> new_files = []; + set_default = false; + + // re-build list to get new default correct + foreach (string file, all_files, + { + if (substring (file, 0, 1) == "*") + { + string old_default = substring (file, 1); // strip leading "*" + if (old_default == filename) // default unchanged + { + new_files = add (new_files, file); + set_default = true; + } + else // new default + { + new_files = add (new_files, old_default); + } + } + else if (file != "") + { + if (file == filename) // mark new default + { + new_files = add (new_files, "*" + filename); + set_default = true; + } + else + { + new_files = add (new_files, file); + } + } + }); + // if we don't have a default by now, it wasn't in the list before + // so add it here. + + if (!set_default + && (filename != "")) + { + new_files = add (new_files, "*" + filename); + } + + new_files = toset (new_files); + + // convert ycp list back to \n separated string + + filenames = mergestring (new_files, "\n") + "\n"; + + SCR::Write(.target.string, vardir + "/filenames", filenames); + + UI::CloseDialog(); + + return true; +} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit wxWidgets for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '12

02 Nov '12

Hello community, here is the log from the commit of package wxWidgets for openSUSE:Factory checked in at 2012-11-02 17:44:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wxWidgets (Old) and /work/SRC/openSUSE:Factory/.wxWidgets.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wxWidgets", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/wxWidgets/wxWidgets-ansi.changes 2012-09-21 13:49:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.wxWidgets.new/wxWidgets-ansi.changes 2012-11-02 17:44:08.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Oct 24 15:38:13 CEST 2012 - sbrabec(a)suse.cz + +- Add "API version" in %description. + +------------------------------------------------------------------- wxWidgets-wxcontainer.changes: same change wxWidgets-wxcontainer24c.changes: same change wxWidgets.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wxWidgets-ansi.spec ++++++ --- /var/tmp/diff_new_pack.D7s7no/_old 2012-11-02 17:44:11.000000000 +0100 +++ /var/tmp/diff_new_pack.D7s7no/_new 2012-11-02 17:44:11.000000000 +0100 @@ -63,6 +63,7 @@ Version: 2.8.12 Release: 0 %define wx_minor %(echo %{version} | sed 's/\.[0-9][0-9]*$//') +%define wx_minor_description %{wx_minor} # libdir for installing of all the stuff %if %ENABLE_STL %define _wxlibdir %{_libdir}/wx-%{wx_minor}-stl @@ -138,6 +139,7 @@ With wxWidgets, you can create applications for different GUIs (GTK+, Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source code. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_base%{WXFLAGS}-2_8-0-%{wx_variant} @@ -154,6 +156,7 @@ %description -n libwx_base%{WXFLAGS}-2_8-0-%{wx_variant} Library for the wxWidgets cross-platform GUI. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_base%{WXFLAGS}_net-2_8-0-%{wx_variant} @@ -163,6 +166,7 @@ %description -n libwx_base%{WXFLAGS}_net-2_8-0-%{wx_variant} Library for the wxWidgets cross-platform GUI. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_base%{WXFLAGS}_xml-2_8-0-%{wx_variant} @@ -172,6 +176,7 @@ %description -n libwx_base%{WXFLAGS}_xml-2_8-0-%{wx_variant} Library for the wxWidgets cross-platform GUI. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_adv-2_8-0-%{wx_variant} @@ -181,6 +186,7 @@ %description -n libwx_gtk2%{WXFLAGS}_adv-2_8-0-%{wx_variant} Library for the wxWidgets cross-platform GUI. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_aui-2_8-0-%{wx_variant} @@ -190,6 +196,7 @@ %description -n libwx_gtk2%{WXFLAGS}_aui-2_8-0-%{wx_variant} Library for the wxWidgets cross-platform GUI. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_core-2_8-0-%{wx_variant} @@ -199,6 +206,7 @@ %description -n libwx_gtk2%{WXFLAGS}_core-2_8-0-%{wx_variant} Library for the wxWidgets cross-platform GUI. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_gizmos-2_8-0-%{wx_variant} @@ -208,6 +216,7 @@ %description -n libwx_gtk2%{WXFLAGS}_gizmos-2_8-0-%{wx_variant} Library for the wxWidgets cross-platform GUI. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_gizmos_xrc-2_8-0-%{wx_variant} @@ -217,6 +226,7 @@ %description -n libwx_gtk2%{WXFLAGS}_gizmos_xrc-2_8-0-%{wx_variant} Library for the wxWidgets cross-platform GUI. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_gl-2_8-0-%{wx_variant} @@ -226,6 +236,7 @@ %description -n libwx_gtk2%{WXFLAGS}_gl-2_8-0-%{wx_variant} Library for the wxWidgets cross-platform GUI. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_html-2_8-0-%{wx_variant} @@ -235,6 +246,7 @@ %description -n libwx_gtk2%{WXFLAGS}_html-2_8-0-%{wx_variant} Library for the wxWidgets cross-platform GUI. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_media-2_8-0-%{wx_variant} @@ -244,6 +256,7 @@ %description -n libwx_gtk2%{WXFLAGS}_media-2_8-0-%{wx_variant} Library for the wxWidgets cross-platform GUI. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_mmedia-2_8-0-%{wx_variant} @@ -253,6 +266,7 @@ %description -n libwx_gtk2%{WXFLAGS}_mmedia-2_8-0-%{wx_variant} Library for the wxWidgets cross-platform GUI. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_plot-2_8-0-%{wx_variant} @@ -262,6 +276,7 @@ %description -n libwx_gtk2%{WXFLAGS}_plot-2_8-0-%{wx_variant} Library for the wxWidgets cross-platform GUI. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_qa-2_8-0-%{wx_variant} @@ -271,6 +286,7 @@ %description -n libwx_gtk2%{WXFLAGS}_qa-2_8-0-%{wx_variant} Library for the wxWidgets cross-platform GUI. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_richtext-2_8-0-%{wx_variant} @@ -280,6 +296,7 @@ %description -n libwx_gtk2%{WXFLAGS}_richtext-2_8-0-%{wx_variant} Library for the wxWidgets cross-platform GUI. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_stc-2_8-0-%{wx_variant} @@ -289,6 +306,7 @@ %description -n libwx_gtk2%{WXFLAGS}_stc-2_8-0-%{wx_variant} Library for the wxWidgets cross-platform GUI. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_svg-2_8-0-%{wx_variant} @@ -298,6 +316,7 @@ %description -n libwx_gtk2%{WXFLAGS}_svg-2_8-0-%{wx_variant} Library for the wxWidgets cross-platform GUI. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_xrc-2_8-0-%{wx_variant} @@ -307,6 +326,7 @@ %description -n libwx_gtk2%{WXFLAGS}_xrc-2_8-0-%{wx_variant} Library for the wxWidgets cross-platform GUI. +API version: %{wx_minor_description} ABI variant: %{wx_description} %if ! %ENABLE_STL @@ -318,6 +338,7 @@ %description -n libwx_gtk2%{WXFLAGS}_fl-2_8-0-%{wx_variant} Library for the wxWidgets cross-platform GUI. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_ogl-2_8-0-%{wx_variant} @@ -328,6 +349,7 @@ %description -n libwx_gtk2%{WXFLAGS}_ogl-2_8-0-%{wx_variant} Library for the wxWidgets cross-platform GUI. +API version: %{wx_minor_description} ABI variant: %{wx_description} %endif @@ -338,6 +360,7 @@ %description plugin-sound_sdl%{WXFLAGS}-2_8-%{wx_variant} SDL Plugin for the wxWidgets cross-platform GUI. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package compat-lib-config @@ -352,6 +375,7 @@ This package contains a ld.so configuration file that allows to use third party binaries with one of available instances of the wxWidgets libraries. +API version: %{wx_minor_description} ABI variant: %{wx_description} Note: compat-lib-config variant packages are mutually exclusive. If you @@ -381,6 +405,7 @@ This package contains a ld.so configuration file that allows to use Fedora binaries with one of available instances of the wxWidgets libraries. +API version: %{wx_minor_description} ABI variant: %{wx_description} This package is exactly equal to @@ -412,6 +437,7 @@ This virtual package contains symbols that allows to install third party packages using wxWidgets libraries. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_base%{WXFLAGS}_net-2_8-0-compat-lib-%{wx_variant} @@ -424,6 +450,7 @@ This virtual package contains symbols that allows to install third party packages using wxWidgets libraries. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_base%{WXFLAGS}_xml-2_8-0-compat-lib-%{wx_variant} @@ -436,6 +463,7 @@ This virtual package contains symbols that allows to install third party packages using wxWidgets libraries. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_adv-2_8-0-compat-lib-%{wx_variant} @@ -448,6 +476,7 @@ This virtual package contains symbols that allows to install third party packages using wxWidgets libraries. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_aui-2_8-0-compat-lib-%{wx_variant} @@ -460,6 +489,7 @@ This virtual package contains symbols that allows to install third party packages using wxWidgets libraries. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_core-2_8-0-compat-lib-%{wx_variant} @@ -472,6 +502,7 @@ This virtual package contains symbols that allows to install third party packages using wxWidgets libraries. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_gizmos-2_8-0-compat-lib-%{wx_variant} @@ -484,6 +515,7 @@ This virtual package contains symbols that allows to install third party packages using wxWidgets libraries. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_gizmos_xrc-2_8-0-compat-lib-%{wx_variant} @@ -496,6 +528,7 @@ This virtual package contains symbols that allows to install third party packages using wxWidgets libraries. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_gl-2_8-0-compat-lib-%{wx_variant} @@ -508,6 +541,7 @@ This virtual package contains symbols that allows to install third party packages using wxWidgets libraries. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_html-2_8-0-compat-lib-%{wx_variant} @@ -520,6 +554,7 @@ This virtual package contains symbols that allows to install third party packages using wxWidgets libraries. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_media-2_8-0-compat-lib-%{wx_variant} @@ -532,6 +567,7 @@ This virtual package contains symbols that allows to install third party packages using wxWidgets libraries. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_mmedia-2_8-0-compat-lib-%{wx_variant} @@ -544,6 +580,7 @@ This virtual package contains symbols that allows to install third party packages using wxWidgets libraries. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_plot-2_8-0-compat-lib-%{wx_variant} @@ -556,6 +593,7 @@ This virtual package contains symbols that allows to install third party packages using wxWidgets libraries. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_qa-2_8-0-compat-lib-%{wx_variant} @@ -568,6 +606,7 @@ This virtual package contains symbols that allows to install third party packages using wxWidgets libraries. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_richtext-2_8-0-compat-lib-%{wx_variant} @@ -580,6 +619,7 @@ This virtual package contains symbols that allows to install third party packages using wxWidgets libraries. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_stc-2_8-0-compat-lib-%{wx_variant} @@ -592,6 +632,7 @@ This virtual package contains symbols that allows to install third party packages using wxWidgets libraries. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_svg-2_8-0-compat-lib-%{wx_variant} @@ -604,6 +645,7 @@ This virtual package contains symbols that allows to install third party packages using wxWidgets libraries. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_xrc-2_8-0-compat-lib-%{wx_variant} @@ -616,6 +658,7 @@ This virtual package contains symbols that allows to install third party packages using wxWidgets libraries. +API version: %{wx_minor_description} ABI variant: %{wx_description} %if ! %ENABLE_STL @@ -630,6 +673,7 @@ This virtual package contains symbols that allows to install third party packages using wxWidgets libraries. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_ogl-2_8-0-compat-lib-%{wx_variant} @@ -643,6 +687,7 @@ This virtual package contains symbols that allows to install third party packages using wxWidgets libraries. +API version: %{wx_minor_description} ABI variant: %{wx_description} %endif @@ -687,6 +732,7 @@ This package contains all files needed for developing with wxGTK. +API version: %{wx_minor_description} ABI variant: %{wx_description} Note: wxWidgets variant devel packages are mutually exclusive. Please wxWidgets-wxcontainer.spec: same change wxWidgets-wxcontainer24c.spec: same change ++++++ wxWidgets.spec ++++++ --- /var/tmp/diff_new_pack.D7s7no/_old 2012-11-02 17:44:11.000000000 +0100 +++ /var/tmp/diff_new_pack.D7s7no/_new 2012-11-02 17:44:11.000000000 +0100 @@ -63,6 +63,7 @@ Version: 2.8.12 Release: 0 %define wx_minor %(echo %{version} | sed 's/\.[0-9][0-9]*$//') +%define wx_minor_description %{wx_minor} # libdir for installing of all the stuff %if %ENABLE_STL %define _wxlibdir %{_libdir}/wx-%{wx_minor}-stl @@ -138,6 +139,7 @@ With wxWidgets, you can create applications for different GUIs (GTK+, Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source code. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_base%{WXFLAGS}-2_8-0-%{wx_variant} @@ -154,6 +156,7 @@ %description -n libwx_base%{WXFLAGS}-2_8-0-%{wx_variant} Library for the wxWidgets cross-platform GUI. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_base%{WXFLAGS}_net-2_8-0-%{wx_variant} @@ -163,6 +166,7 @@ %description -n libwx_base%{WXFLAGS}_net-2_8-0-%{wx_variant} Library for the wxWidgets cross-platform GUI. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_base%{WXFLAGS}_xml-2_8-0-%{wx_variant} @@ -172,6 +176,7 @@ %description -n libwx_base%{WXFLAGS}_xml-2_8-0-%{wx_variant} Library for the wxWidgets cross-platform GUI. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_adv-2_8-0-%{wx_variant} @@ -181,6 +186,7 @@ %description -n libwx_gtk2%{WXFLAGS}_adv-2_8-0-%{wx_variant} Library for the wxWidgets cross-platform GUI. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_aui-2_8-0-%{wx_variant} @@ -190,6 +196,7 @@ %description -n libwx_gtk2%{WXFLAGS}_aui-2_8-0-%{wx_variant} Library for the wxWidgets cross-platform GUI. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_core-2_8-0-%{wx_variant} @@ -199,6 +206,7 @@ %description -n libwx_gtk2%{WXFLAGS}_core-2_8-0-%{wx_variant} Library for the wxWidgets cross-platform GUI. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_gizmos-2_8-0-%{wx_variant} @@ -208,6 +216,7 @@ %description -n libwx_gtk2%{WXFLAGS}_gizmos-2_8-0-%{wx_variant} Library for the wxWidgets cross-platform GUI. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_gizmos_xrc-2_8-0-%{wx_variant} @@ -217,6 +226,7 @@ %description -n libwx_gtk2%{WXFLAGS}_gizmos_xrc-2_8-0-%{wx_variant} Library for the wxWidgets cross-platform GUI. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_gl-2_8-0-%{wx_variant} @@ -226,6 +236,7 @@ %description -n libwx_gtk2%{WXFLAGS}_gl-2_8-0-%{wx_variant} Library for the wxWidgets cross-platform GUI. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_html-2_8-0-%{wx_variant} @@ -235,6 +246,7 @@ %description -n libwx_gtk2%{WXFLAGS}_html-2_8-0-%{wx_variant} Library for the wxWidgets cross-platform GUI. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_media-2_8-0-%{wx_variant} @@ -244,6 +256,7 @@ %description -n libwx_gtk2%{WXFLAGS}_media-2_8-0-%{wx_variant} Library for the wxWidgets cross-platform GUI. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_mmedia-2_8-0-%{wx_variant} @@ -253,6 +266,7 @@ %description -n libwx_gtk2%{WXFLAGS}_mmedia-2_8-0-%{wx_variant} Library for the wxWidgets cross-platform GUI. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_plot-2_8-0-%{wx_variant} @@ -262,6 +276,7 @@ %description -n libwx_gtk2%{WXFLAGS}_plot-2_8-0-%{wx_variant} Library for the wxWidgets cross-platform GUI. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_qa-2_8-0-%{wx_variant} @@ -271,6 +286,7 @@ %description -n libwx_gtk2%{WXFLAGS}_qa-2_8-0-%{wx_variant} Library for the wxWidgets cross-platform GUI. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_richtext-2_8-0-%{wx_variant} @@ -280,6 +296,7 @@ %description -n libwx_gtk2%{WXFLAGS}_richtext-2_8-0-%{wx_variant} Library for the wxWidgets cross-platform GUI. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_stc-2_8-0-%{wx_variant} @@ -289,6 +306,7 @@ %description -n libwx_gtk2%{WXFLAGS}_stc-2_8-0-%{wx_variant} Library for the wxWidgets cross-platform GUI. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_svg-2_8-0-%{wx_variant} @@ -298,6 +316,7 @@ %description -n libwx_gtk2%{WXFLAGS}_svg-2_8-0-%{wx_variant} Library for the wxWidgets cross-platform GUI. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_xrc-2_8-0-%{wx_variant} @@ -307,6 +326,7 @@ %description -n libwx_gtk2%{WXFLAGS}_xrc-2_8-0-%{wx_variant} Library for the wxWidgets cross-platform GUI. +API version: %{wx_minor_description} ABI variant: %{wx_description} %if ! %ENABLE_STL @@ -318,6 +338,7 @@ %description -n libwx_gtk2%{WXFLAGS}_fl-2_8-0-%{wx_variant} Library for the wxWidgets cross-platform GUI. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_ogl-2_8-0-%{wx_variant} @@ -328,6 +349,7 @@ %description -n libwx_gtk2%{WXFLAGS}_ogl-2_8-0-%{wx_variant} Library for the wxWidgets cross-platform GUI. +API version: %{wx_minor_description} ABI variant: %{wx_description} %endif @@ -338,6 +360,7 @@ %description plugin-sound_sdl%{WXFLAGS}-2_8-%{wx_variant} SDL Plugin for the wxWidgets cross-platform GUI. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package compat-lib-config @@ -352,6 +375,7 @@ This package contains a ld.so configuration file that allows to use third party binaries with one of available instances of the wxWidgets libraries. +API version: %{wx_minor_description} ABI variant: %{wx_description} Note: compat-lib-config variant packages are mutually exclusive. If you @@ -381,6 +405,7 @@ This package contains a ld.so configuration file that allows to use Fedora binaries with one of available instances of the wxWidgets libraries. +API version: %{wx_minor_description} ABI variant: %{wx_description} This package is exactly equal to @@ -412,6 +437,7 @@ This virtual package contains symbols that allows to install third party packages using wxWidgets libraries. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_base%{WXFLAGS}_net-2_8-0-compat-lib-%{wx_variant} @@ -424,6 +450,7 @@ This virtual package contains symbols that allows to install third party packages using wxWidgets libraries. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_base%{WXFLAGS}_xml-2_8-0-compat-lib-%{wx_variant} @@ -436,6 +463,7 @@ This virtual package contains symbols that allows to install third party packages using wxWidgets libraries. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_adv-2_8-0-compat-lib-%{wx_variant} @@ -448,6 +476,7 @@ This virtual package contains symbols that allows to install third party packages using wxWidgets libraries. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_aui-2_8-0-compat-lib-%{wx_variant} @@ -460,6 +489,7 @@ This virtual package contains symbols that allows to install third party packages using wxWidgets libraries. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_core-2_8-0-compat-lib-%{wx_variant} @@ -472,6 +502,7 @@ This virtual package contains symbols that allows to install third party packages using wxWidgets libraries. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_gizmos-2_8-0-compat-lib-%{wx_variant} @@ -484,6 +515,7 @@ This virtual package contains symbols that allows to install third party packages using wxWidgets libraries. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_gizmos_xrc-2_8-0-compat-lib-%{wx_variant} @@ -496,6 +528,7 @@ This virtual package contains symbols that allows to install third party packages using wxWidgets libraries. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_gl-2_8-0-compat-lib-%{wx_variant} @@ -508,6 +541,7 @@ This virtual package contains symbols that allows to install third party packages using wxWidgets libraries. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_html-2_8-0-compat-lib-%{wx_variant} @@ -520,6 +554,7 @@ This virtual package contains symbols that allows to install third party packages using wxWidgets libraries. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_media-2_8-0-compat-lib-%{wx_variant} @@ -532,6 +567,7 @@ This virtual package contains symbols that allows to install third party packages using wxWidgets libraries. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_mmedia-2_8-0-compat-lib-%{wx_variant} @@ -544,6 +580,7 @@ This virtual package contains symbols that allows to install third party packages using wxWidgets libraries. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_plot-2_8-0-compat-lib-%{wx_variant} @@ -556,6 +593,7 @@ This virtual package contains symbols that allows to install third party packages using wxWidgets libraries. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_qa-2_8-0-compat-lib-%{wx_variant} @@ -568,6 +606,7 @@ This virtual package contains symbols that allows to install third party packages using wxWidgets libraries. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_richtext-2_8-0-compat-lib-%{wx_variant} @@ -580,6 +619,7 @@ This virtual package contains symbols that allows to install third party packages using wxWidgets libraries. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_stc-2_8-0-compat-lib-%{wx_variant} @@ -592,6 +632,7 @@ This virtual package contains symbols that allows to install third party packages using wxWidgets libraries. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_svg-2_8-0-compat-lib-%{wx_variant} @@ -604,6 +645,7 @@ This virtual package contains symbols that allows to install third party packages using wxWidgets libraries. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_xrc-2_8-0-compat-lib-%{wx_variant} @@ -616,6 +658,7 @@ This virtual package contains symbols that allows to install third party packages using wxWidgets libraries. +API version: %{wx_minor_description} ABI variant: %{wx_description} %if ! %ENABLE_STL @@ -630,6 +673,7 @@ This virtual package contains symbols that allows to install third party packages using wxWidgets libraries. +API version: %{wx_minor_description} ABI variant: %{wx_description} %package -n libwx_gtk2%{WXFLAGS}_ogl-2_8-0-compat-lib-%{wx_variant} @@ -643,6 +687,7 @@ This virtual package contains symbols that allows to install third party packages using wxWidgets libraries. +API version: %{wx_minor_description} ABI variant: %{wx_description} %endif @@ -687,6 +732,7 @@ This package contains all files needed for developing with wxGTK. +API version: %{wx_minor_description} ABI variant: %{wx_description} Note: wxWidgets variant devel packages are mutually exclusive. Please -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit vaapi-intel-driver for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '12

02 Nov '12

Hello community, here is the log from the commit of package vaapi-intel-driver for openSUSE:Factory checked in at 2012-11-02 17:43:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vaapi-intel-driver (Old) and /work/SRC/openSUSE:Factory/.vaapi-intel-driver.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vaapi-intel-driver", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/vaapi-intel-driver/vaapi-intel-driver.changes 2012-07-13 11:36:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vaapi-intel-driver.new/vaapi-intel-driver.changes 2012-11-02 17:43:49.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Oct 18 13:46:56 UTC 2012 - kkhere.geo(a)gmail.com + +- update to git master commit b6dd872 as released version does not + build with the latest libva release + +------------------------------------------------------------------- Old: ---- intel-driver-1.0.18.tar.xz New: ---- intel-driver-b6dd8725c97bb75caa4f5193e510cd53ea1e85a2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vaapi-intel-driver.spec ++++++ --- /var/tmp/diff_new_pack.RVGXlr/_old 2012-11-02 17:43:50.000000000 +0100 +++ /var/tmp/diff_new_pack.RVGXlr/_new 2012-11-02 17:43:50.000000000 +0100 @@ -17,15 +17,17 @@ %define srcname intel-driver +%define snapshot b6dd8725c97bb75caa4f5193e510cd53ea1e85a2 +%define snap b6dd872 Name: vaapi-intel-driver -Version: 1.0.18 +Version: 1.0.18_git%{snap} Release: 0 Summary: Intel Driver for Video Acceleration (VA) API for Linux License: MIT and EPL-1.0 Group: System/Libraries Url: http://freedesktop.org/wiki/Software/vaapi -Source0: http://cgit.freedesktop.org/vaapi/intel-driver/snapshot/%{srcname}-%{versio… +Source0: http://cgit.freedesktop.org/vaapi/intel-driver/snapshot/%{srcname}-%{snapsh… # Intel graphics hardware only available on these platforms ExclusiveArch: %ix86 x86_64 BuildRequires: libtool @@ -39,7 +41,7 @@ Intel Driver for Libva is a library providing the VA API video acceleration API. %prep -%setup -q -n %{srcname}-%{version} +%setup -q -n %{srcname}-%{snapshot} %build autoreconf -fiv -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit udisks2 for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '12

02 Nov '12

Hello community, here is the log from the commit of package udisks2 for openSUSE:Factory checked in at 2012-11-02 17:43:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/udisks2 (Old) and /work/SRC/openSUSE:Factory/.udisks2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "udisks2", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/udisks2/udisks2.changes 2012-10-07 20:08:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.udisks2.new/udisks2.changes 2012-11-02 17:43:41.000000000 +0100 @@ -1,0 +2,34 @@ +Wed Oct 24 12:16:42 UTC 2012 - meissner(a)suse.com + +- remove the rpmlintrc after adding the privs bnc#779404 + +------------------------------------------------------------------- +Wed Oct 17 13:03:06 UTC 2012 - fcrozat(a)suse.com + +- Fix build with new udev rules directory location. + +------------------------------------------------------------------- +Tue Sep 25 09:19:57 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 1.99.0: + + Catch up with latest polkit guidance + + Don't require auth for Standby'ing non-system drives on own + seat + + Mark Realtek rts5229 based card readers as flash drives + + Black-list seemingly invalid WWN for SAMSUNG SP1604N hard disks + + Ignore non-Linux software on SanDisk Cruzer + + Add drive configuration interfaces and configuration files + + Add "Linux Filesystem" GPT partition type + + Add support for VMWare filesystem types and GPT partition types + + Update integration tests. + + Bugs fixed: + - fdo#51439: udisks should hide lvm PVs +- Changes from version 1.98.0: + + Drive: Refuse to eject drives that appear to be in use + + udisksd: work if polkitd is not available + + Updated documentations + + Bugs fixed: + - fdo49842: Unhandled rootfs on bind mount +- Drop udisks-hide-lvm-raid-partitions.patch: fixed upstream. + +------------------------------------------------------------------- Old: ---- udisks-1.97.0.tar.bz2 udisks-hide-lvm-raid-partitions.patch New: ---- udisks-1.99.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ udisks2.spec ++++++ --- /var/tmp/diff_new_pack.i88giY/_old 2012-11-02 17:43:43.000000000 +0100 +++ /var/tmp/diff_new_pack.i88giY/_new 2012-11-02 17:43:43.000000000 +0100 @@ -16,17 +16,17 @@ # +%define _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d + Name: udisks2 %define _name udisks -Version: 1.97.0 +Version: 1.99.0 Release: 0 Summary: Disk Management Service, version 2 License: GPL-2.0+ Group: System/Daemons Url: http://www.freedesktop.org/wiki/Software/udisks Source: http://udisks.freedesktop.org/releases/%{_name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM udisks-hide-lvm-raid-partitions.patch fdo#51439 bnc#737038 gber(a)opensuse.org -- Hide partitions marked as containing LVM and RAID. This is only useful for encrypted partitions. -Patch0: udisks-hide-lvm-raid-partitions.patch # PATCH-FIX-UPSTREAM systemd-dynamic-check.diff fdo#55309 bnc#769570 tiwai(a)suse.de -- Add a check of running systemd so that it still works with sysvinit Patch1: systemd-dynamic-check.diff # Needed to build the man pages @@ -37,7 +37,7 @@ BuildRequires: intltool BuildRequires: libacl-devel # For xsltproc -BuildRequires: libxslt-devel +BuildRequires: xsltproc BuildRequires: pkgconfig(gio-unix-2.0) >= 2.31.13 BuildRequires: pkgconfig(glib-2.0) >= 2.31.13 BuildRequires: pkgconfig(gudev-1.0) >= 147 @@ -95,7 +95,6 @@ %lang_package %prep %setup -q -n %{_name}-%{version} -%patch0 -p1 %patch1 -p1 %build @@ -131,7 +130,7 @@ %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README %{_unitdir}/udisks2.service -/lib/udev/rules.d/80-udisks2.rules +%{_udevrulesdir}/80-udisks2.rules %{_sbindir}/umount.udisks2 %{_bindir}/udisksctl %dir %{_libexecdir}/udisks2 ++++++ udisks-1.97.0.tar.bz2 -> udisks-1.99.0.tar.bz2 ++++++ ++++ 57755 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit thttpd for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '12

02 Nov '12

Hello community, here is the log from the commit of package thttpd for openSUSE:Factory checked in at 2012-11-02 17:43:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/thttpd (Old) and /work/SRC/openSUSE:Factory/.thttpd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "thttpd", Maintainer is "VCizek(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/thttpd/thttpd.changes 2012-06-12 22:10:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.thttpd.new/thttpd.changes 2012-11-02 17:43:30.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Oct 24 21:20:29 UTC 2012 - suse(a)ammler.ch + +- use different versions of automake (SLE) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ thttpd.spec ++++++ --- /var/tmp/diff_new_pack.XWx5Ip/_old 2012-11-02 17:43:33.000000000 +0100 +++ /var/tmp/diff_new_pack.XWx5Ip/_new 2012-11-02 17:43:33.000000000 +0100 @@ -77,7 +77,7 @@ %patch12 %build -cp /usr/share/automake-1.11/config.* . || cp /usr/share/automake-1.12/config.* . +cp /usr/share/automake-1.*/config.* . # update server root path sed -i "s@__SRVROOT__@%{serverroot}/htdocs@g" README.SuSE SuSE/etc/thttpd.conf sed -i "s@__PREFIX__@%{_prefix}@g;\ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sysconfig for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '12

02 Nov '12

Hello community, here is the log from the commit of package sysconfig for openSUSE:Factory checked in at 2012-11-02 17:43:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sysconfig (Old) and /work/SRC/openSUSE:Factory/.sysconfig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sysconfig", Maintainer is "mt(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/sysconfig/sysconfig.changes 2012-10-27 13:25:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sysconfig.new/sysconfig.changes 2012-11-02 17:43:07.000000000 +0100 @@ -1,0 +2,13 @@ +Thu Nov 1 17:08:25 UTC 2012 - mt(a)suse.com + +- version 0.76.7 +- Start ifup pre/post and if-up.d/if-down.d scripts in background. + The new network/config variable WAIT_BACKGROUND_JOBS specifies + the wait limit. Default is 5 secons, 0 disables backgrounding + and reverts to previous blocking behavior. Attempt to solve the + issues where interfaces are not come up in time, because some + hook-script are blocking ifup (bnc#780644). +- Execute netconfig/ntp-runtime updates in background (bnc#780644). +- Man-page hint to use STARTMODE=nfsroot when using iSCSI or FCoE. + +------------------------------------------------------------------- Old: ---- sysconfig-0.76.6.tar.bz2 New: ---- sysconfig-0.76.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysconfig.spec ++++++ --- /var/tmp/diff_new_pack.vUg29I/_old 2012-11-02 17:43:10.000000000 +0100 +++ /var/tmp/diff_new_pack.vUg29I/_new 2012-11-02 17:43:10.000000000 +0100 @@ -17,7 +17,7 @@ Name: sysconfig -Version: 0.76.6 +Version: 0.76.7 Release: 0 Summary: The sysconfig scheme and traditional network scripts License: GPL-2.0+ ++++++ sysconfig-0.76.6.tar.bz2 -> sysconfig-0.76.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.76.6/ChangeLog new/sysconfig-0.76.7/ChangeLog --- old/sysconfig-0.76.6/ChangeLog 2012-10-26 13:39:19.000000000 +0200 +++ new/sysconfig-0.76.7/ChangeLog 2012-11-01 18:22:06.000000000 +0100 @@ -1,4 +1,33 @@ -commit a964df866b304fcabfc189cc73475080a1b4b4dc (HEAD, tag: version-0.76.6, public/master, origin/master, export/master, master) +commit fbdfff3aaa236a7909b03981bf6d6db0b0cd48c5 (HEAD, master-jobs, master) +Author: Marius Tomaschewski <mt(a)suse.com> +Date: Thu Nov 1 18:17:37 2012 +0100 + + version 0.76.7, updated changes file + +commit ba4f43c796427a7749504d23969a2340789571f2 +Author: Marius Tomaschewski <mt(a)suse.com> +Date: Thu Nov 1 17:54:45 2012 +0100 + + Execute netconfig/ntp-runtime update in background + +commit 52964539fa72a820a7d390cac577861d41f17f3e +Author: Marius Tomaschewski <mt(a)suse.com> +Date: Thu Nov 1 17:54:00 2012 +0100 + + Background ifup pre/post and if-up.d/if-down.d scripts + + New network/config variable WAIT_BACKGROUND_JOBS with a + default of 5 secs wait limit. A WAIT_BACKGROUND_JOBS=0 + disables a parallel/background hook script execution. + +commit 2f25f2e046af65db2056b009da181eec31e9d1cd (public/master, origin/master, export/master) +Merge: a964df8 95976ed +Author: Marius Tomaschewski <mt(a)suse.com> +Date: Fri Oct 26 14:08:36 2012 +0200 + + Merge commit 'refs/merge-requests/1' of git://gitorious.org/opensuse/sysconfig + +commit a964df866b304fcabfc189cc73475080a1b4b4dc (tag: version-0.76.6) Author: Marius Tomaschewski <mt(a)suse.com> Date: Fri Oct 26 13:32:21 2012 +0200 @@ -18,7 +47,7 @@ version 0.76.5 -commit 9bb6f64db086f0364f153ba142b5f3be67ce4baf (opensuse-12.2-update-work) +commit 9bb6f64db086f0364f153ba142b5f3be67ce4baf Author: Marius Tomaschewski <mt(a)suse.com> Date: Thu Oct 25 16:30:51 2012 +0200 @@ -77,7 +106,19 @@ Use dhclient -v when debug is enabled (bnc#780644) -commit 24a91302e36c7773ecf4bc29801287452c960640 (tag: version-0.76.4, opensuse-12.2-update, opensuse-12.2) +commit 95976edae8503a0f61308628aed1b176fc09fd9f +Author: Gregor Dschung <dschung(a)lts032.itwm.fhg.de> +Date: Tue Sep 11 15:24:45 2012 +0200 + + Hint to use STARTMODE=nfsroot when using iSCSI or FCoE + +commit 3a9dd29ab9a56cefd7b6f1cf83cac60c40e7d682 +Author: Gregor Dschung <dschung(a)lts032.itwm.fhg.de> +Date: Tue Sep 11 15:11:55 2012 +0200 + + Hint to use STARTMODE=nfsroot when using iSCSI + +commit 24a91302e36c7773ecf4bc29801287452c960640 (tag: version-0.76.4, tag: opensuse-12.2-release, public/opensuse-12.2, origin/opensuse-12.2, export/opensuse-12.2, opensuse-12.2) Author: Marius Tomaschewski <mt(a)suse.com> Date: Thu Aug 9 16:42:02 2012 +0000 @@ -412,7 +453,7 @@ - add libtool as buildrequire to avoid implicit dependency - Updated package/sysconfig.changes file -commit 9c61279efc7787953b2fdfe38be9802e0310292c (public/opensuse-12.1, origin/opensuse-12.1, export/opensuse-12.1, opensuse-12.1) +commit 9c61279efc7787953b2fdfe38be9802e0310292c (tag: opensuse-12.1-release) Author: Marius Tomaschewski <mt(a)suse.com> Date: Fri Oct 21 14:27:53 2011 +0200 @@ -1973,7 +2014,7 @@ git-svn-id: https://svn.suse.de/svn/sysconfig/trunk@1980 bf393798-0adf-0310-9952-bd479070b6c1 -commit e61f37a520adc1f4d1569b645d9d960f3e4c68e9 (tag: opensuse-11.2-final) +commit e61f37a520adc1f4d1569b645d9d960f3e4c68e9 Author: mt <mt@bf393798-0adf-0310-9952-bd479070b6c1> Date: Fri Oct 9 13:39:58 2009 +0000 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.76.6/VERSION new/sysconfig-0.76.7/VERSION --- old/sysconfig-0.76.6/VERSION 2012-10-26 13:28:34.000000000 +0200 +++ new/sysconfig-0.76.7/VERSION 2012-11-01 18:21:39.000000000 +0100 @@ -1 +1 @@ -0.76.6 +0.76.7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.76.6/config/ifcfg.template new/sysconfig-0.76.7/config/ifcfg.template --- old/sysconfig-0.76.6/config/ifcfg.template 2012-10-18 11:31:09.000000000 +0200 +++ new/sysconfig-0.76.7/config/ifcfg.template 2012-11-01 17:37:49.000000000 +0100 @@ -18,7 +18,8 @@ # IFPLUGD_PRIORITY.) # - nfsroot: Nearly like 'auto'. But interfaces with this startmode will never # be shut down via 'rcnetwork stop'. 'ifdown <iface>' still works. -# Use this when you have a nfs root filesystem. +# Use this when you have a nfs root filesystem or you connect to an +# iSCSI / FCoE target. # - manual: start it only when ifup is called manually # - off: will not be started at all # - onboot: alias for auto, deprecated, only for backward compliance diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.76.6/config/sysconfig.config-network new/sysconfig-0.76.7/config/sysconfig.config-network --- old/sysconfig-0.76.6/config/sysconfig.config-network 2012-10-26 13:19:26.000000000 +0200 +++ new/sysconfig-0.76.7/config/sysconfig.config-network 2012-11-01 18:21:39.000000000 +0100 @@ -22,6 +22,16 @@ GLOBAL_POST_UP_EXEC="yes" GLOBAL_PRE_DOWN_EXEC="yes" +## Type: integer +### Default: 5 +## +## Specifies the number of seconds ifup(8)/ifdown(8) should wait for the +## PRE/POST, if-up.d/if-down.d scripts, executed in parallel then. +## A setting of 0 disables the background execution (reverts to previous +## blocking behavior). +## +WAIT_BACKGROUND_JOBS=5 + ## Type: yesno ## Default: no # If ifup should check if an ip address is already in use, set this to yes. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.76.6/configure new/sysconfig-0.76.7/configure --- old/sysconfig-0.76.6/configure 2012-10-26 13:38:24.000000000 +0200 +++ new/sysconfig-0.76.7/configure 2012-11-01 18:21:56.000000000 +0100 @@ -1,7 +1,7 @@ #! /bin/sh # From configure.in Revision: 1.13 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for sysconfig 0.76.6. +# Generated by GNU Autoconf 2.69 for sysconfig 0.76.7. # # Report bugs to <http://www.suse.de/feedback/>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='sysconfig' PACKAGE_TARNAME='sysconfig' -PACKAGE_VERSION='0.76.6' -PACKAGE_STRING='sysconfig 0.76.6' +PACKAGE_VERSION='0.76.7' +PACKAGE_STRING='sysconfig 0.76.7' PACKAGE_BUGREPORT='http://www.suse.de/feedback/' PACKAGE_URL='' @@ -1320,7 +1320,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 sysconfig 0.76.6 to adapt to many kinds of systems. +\`configure' configures sysconfig 0.76.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1390,7 +1390,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sysconfig 0.76.6:";; + short | recursive ) echo "Configuration of sysconfig 0.76.7:";; esac cat <<\_ACEOF @@ -1494,7 +1494,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -sysconfig configure 0.76.6 +sysconfig configure 0.76.7 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1863,7 +1863,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by sysconfig $as_me 0.76.6, which was +It was created by sysconfig $as_me 0.76.7, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2691,7 +2691,7 @@ # Define the identity of the package. PACKAGE='sysconfig' - VERSION='0.76.6' + VERSION='0.76.7' cat >>confdefs.h <<_ACEOF @@ -12161,7 +12161,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by sysconfig $as_me 0.76.6, which was +This file was extended by sysconfig $as_me 0.76.7, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12218,7 +12218,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -sysconfig config.status 0.76.6 +sysconfig config.status 0.76.7 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.76.6/scripts/functions new/sysconfig-0.76.7/scripts/functions --- old/sysconfig-0.76.6/scripts/functions 2012-10-26 12:58:03.000000000 +0200 +++ new/sysconfig-0.76.7/scripts/functions 2012-11-01 18:21:39.000000000 +0100 @@ -81,6 +81,20 @@ eval "$v='${l[@]}'" } +wait_jobs() +{ + local -i wsecs=$1 + local -i uwait=25000 + local -i loops=$(((wsecs * 1000000) / $uwait)) + local -i loop=0 + local -a jpids=($(jobs -pr)) + while (( ${#jpids[@]} > 0 && loop++ < loops)) ; do + usleep $uwait + jpids=($(jobs -pr)) + done + return ${#jpids[@]} +} + nm_running () { local MSG RET test -x "$NETWORKMANAGER_BIN" || return diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.76.6/scripts/ifup new/sysconfig-0.76.7/scripts/ifup --- old/sysconfig-0.76.6/scripts/ifup 2012-10-26 12:58:03.000000000 +0200 +++ new/sysconfig-0.76.7/scripts/ifup 2012-11-01 18:21:39.000000000 +0100 @@ -688,7 +688,11 @@ # ignore backup files and leftovers from rpm echo $SCRIPT | grep -q '$\.rpm\(save\|new$$\)\|$.~$$' && continue; debug "executing additional global stop script $SCRIPT" - $SCRIPT $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} + if test $((${WAIT_BACKGROUND_JOBS:-0})) -gt 0 ; then + $SCRIPT $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} & + else + $SCRIPT $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} + fi done fi @@ -698,9 +702,16 @@ for SCRIPT in `eval echo $PRE_DOWN_SCRIPT scripts/$PRE_DOWN_SCRIPT`; do if [ -x "$SCRIPT" -a ! -d "$SCRIPT" ] ; then debug "executing additional stop script $SCRIPT" - $SCRIPT $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} + if test $((${WAIT_BACKGROUND_JOBS:-0})) -gt 0 ; then + $SCRIPT $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} & + else + $SCRIPT $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} + fi fi done + if test $((${WAIT_BACKGROUND_JOBS:-0})) -gt 0 ; then + wait_jobs ${WAIT_BACKGROUND_JOBS:-0} || disown -a + fi # shut down depending services first scripts/${SCRIPTNAME}-services $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} @@ -715,9 +726,16 @@ for SCRIPT in `eval echo $PRE_UP_SCRIPT scripts/$PRE_UP_SCRIPT`; do if [ -x "$SCRIPT" -a ! -d "$SCRIPT" ] ; then debug "executing additional start script $SCRIPT" - $SCRIPT $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} + if test $((${WAIT_BACKGROUND_JOBS:-0})) -gt 0 ; then + $SCRIPT $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} & + else + $SCRIPT $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} + fi fi done + if test $((${WAIT_BACKGROUND_JOBS:-0})) -gt 0 ; then + wait_jobs ${WAIT_BACKGROUND_JOBS:-0} || disown -a + fi fi fi @@ -1397,7 +1415,11 @@ # ignore backup files and leftovers from rpm echo $SCRIPT | grep -q '$\.rpm\(save\|new$$\)\|$.~$$' && continue; debug "executing additional global start script $SCRIPT" - $SCRIPT $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} + if test $((${WAIT_BACKGROUND_JOBS:-0})) -gt 0 ; then + $SCRIPT $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} & + else + $SCRIPT $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} + fi done fi @@ -1407,10 +1429,16 @@ for SCRIPT in `eval echo $POST_UP_SCRIPT scripts/$POST_UP_SCRIPT`; do if [ -x "$SCRIPT" -a ! -d "$SCRIPT" ] ; then debug "executing additional start script $SCRIPT" - $SCRIPT $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} + if test $((${WAIT_BACKGROUND_JOBS:-0})) -gt 0 ; then + $SCRIPT $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} & + else + $SCRIPT $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} + fi fi done - + if test $((${WAIT_BACKGROUND_JOBS:-0})) -gt 0 ; then + wait_jobs ${WAIT_BACKGROUND_JOBS:-0} || disown -a + fi fi # execute an individual poststop script if available @@ -1421,9 +1449,16 @@ for SCRIPT in `eval echo $POST_DOWN_SCRIPT scripts/$POST_DOWN_SCRIPT`; do if [ -x "$SCRIPT" -a ! -d "$SCRIPT" ] ; then debug "executing additional stop script $SCRIPT" - $SCRIPT $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} + if test $((${WAIT_BACKGROUND_JOBS:-0})) -gt 0 ; then + $SCRIPT $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} & + else + $SCRIPT $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} + fi fi done + if test $((${WAIT_BACKGROUND_JOBS:-0})) -gt 0 ; then + wait_jobs ${WAIT_BACKGROUND_JOBS:-0} || disown -a + fi fi # We have to respect the status of ifplugd for interfaces with diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.76.6/scripts/netconfig.d/ntp-runtime new/sysconfig-0.76.7/scripts/netconfig.d/ntp-runtime --- old/sysconfig-0.76.6/scripts/netconfig.d/ntp-runtime 2012-10-26 12:58:03.000000000 +0200 +++ new/sysconfig-0.76.7/scripts/netconfig.d/ntp-runtime 2012-11-01 18:21:39.000000000 +0100 @@ -231,26 +231,36 @@ # here we should restart services if needed -# -# do not restart or it may (will) block ifup -# just try to add the server at runtime ... -# -NTP_CONF="/etc/ntp.conf" -NTPDC_BIN="/usr/sbin/ntpdc" - -if [ -n "${NTP_SERVER_LIST[*]}" -a -f "${NTP_CONF}" ] && /etc/init.d/ntp status >/dev/null 2>/dev/null ; then - NTP_KEYS=$(awk '/^keys/ { print $2 }' $NTP_CONF) - NTP_KEYID=$(awk '/^requestkey[[:blank:]]/ { print $2 }' $NTP_CONF) - NTP_PASSWD=$(test -n "$NTP_KEYS" -a -n "$NTP_KEYID" -a -r "$NTP_KEYS" && awk '$0 ~ key { print $3 }' key="^[[:blank:]]*$NTP_KEYID[[:blank:]]" $NTP_KEYS) - - if [ -n "$NTP_KEYS" -a -n "$NTP_PASSWD" ] ; then - for server in ${NTP_SERVER_LIST[*]} ; do - NTPDC_CMD="keyid $NTP_KEYID\npasswd $NTP_PASSWD\naddserver $server\n" - NTPDC_LOG=$(echo -e "${NTPDC_CMD}quit" | $NTPDC_BIN) - debug "$PROGNAME add-server: $server" - done +do_runtime_update() +{ + # + # do not restart or it may (will) block ifup + # just try to add the server at runtime ... + # + NTP_CONF="/etc/ntp.conf" + NTPDC_BIN="/usr/sbin/ntpdc" + + if [ -n "${NTP_SERVER_LIST[*]}" -a -f "${NTP_CONF}" ] && \ + /etc/init.d/ntp status >/dev/null 2>/dev/null ; then + NTP_KEYS=$(awk -- '/^keys/ { print $2 }' $NTP_CONF 2>/dev/null) + NTP_KEYID=$(awk -- '/^requestkey[[:blank:]]/ { print $2 }' $NTP_CONF 2>/dev/null) + NTP_PASSWD=$(test -n "$NTP_KEYS" -a -n "$NTP_KEYID" -a -r "$NTP_KEYS" && \ + awk -- '$0 ~ key { print $3 }' key="^[[:blank:]]*$NTP_KEYID[[:blank:]]" \ + $NTP_KEYS 2>/dev/null) + + if [ -n "$NTP_KEYS" -a -n "$NTP_PASSWD" ] ; then + for server in ${NTP_SERVER_LIST[*]} ; do + NTPDC_CMD="keyid $NTP_KEYID\npasswd $NTP_PASSWD\naddserver $server\n" + NTPDC_LOG=$(echo -e "${NTPDC_CMD}quit" | $NTPDC_BIN) + debug "$PROGNAME add-server: $server" + done + fi fi -fi +} + +# runtime update always in background +( do_runtime_update & ) +disown -a exit 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.76.6/sysconfig.spec new/sysconfig-0.76.7/sysconfig.spec --- old/sysconfig-0.76.6/sysconfig.spec 2012-10-26 13:38:28.000000000 +0200 +++ new/sysconfig-0.76.7/sysconfig.spec 2012-11-01 18:22:00.000000000 +0100 @@ -18,7 +18,7 @@ Name: sysconfig -Version: 0.76.6 +Version: 0.76.7 Release: 0 Summary: The sysconfig scheme and traditional network scripts License: GPL-2.0+ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0