Hello community, here is the log from the commit of package yast2-sysconfig for openSUSE:Factory checked in at 2012-04-02 10:32:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-sysconfig (Old) and /work/SRC/openSUSE:Factory/.yast2-sysconfig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-sysconfig", Maintainer is "lslezak@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-sysconfig/yast2-sysconfig.changes 2011-10-03 09:27:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-sysconfig.new/yast2-sysconfig.changes 2012-04-02 10:32:21.000000000 +0200 @@ -1,0 +2,12 @@ +Fri Mar 30 14:18:00 UTC 2012 - lslezak@suse.cz + +- fixed displaying UTF-8 values (bnc#728588), fixed handling values + containing single quotes +- 2.22.0 + +------------------------------------------------------------------- +Thu Mar 29 16:09:54 CEST 2012 - jsuchome@suse.cz + +- merge proofread texts + +------------------------------------------------------------------- Old: ---- yast2-sysconfig-2.21.2.tar.bz2 New: ---- yast2-sysconfig-2.22.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-sysconfig.spec ++++++ --- /var/tmp/diff_new_pack.OVsEQ1/_old 2012-04-02 10:32:23.000000000 +0200 +++ /var/tmp/diff_new_pack.OVsEQ1/_new 2012-04-02 10:32:23.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-sysconfig # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,32 +15,41 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: yast2-sysconfig -Version: 2.21.2 +Version: 2.22.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-sysconfig-%{version}.tar.bz2 -Prefix: /usr - -Group: System/YaST -License: GPL-2.0+ -BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite -Requires: yast2 perl +BuildRequires: perl-XML-Writer +BuildRequires: update-desktop-files +BuildRequires: yast2 +BuildRequires: yast2-devtools +BuildRequires: yast2-testsuite +Requires: perl +Requires: yast2 Requires: yast2 >= 2.21.22 BuildArch: noarch -Provides: y2c_rc_config yast2-config-rcconfig yast2-config-sysconfig -Obsoletes: y2c_rc_config yast2-config-rcconfig yast2-config-sysconfig -Provides: yast2-trans-sysconfig yast2-trans-rcconfig y2t_rc_config -Obsoletes: yast2-trans-sysconfig yast2-trans-rcconfig y2t_rc_config +Provides: y2c_rc_config +Provides: yast2-config-rcconfig +Provides: yast2-config-sysconfig +Obsoletes: y2c_rc_config +Obsoletes: yast2-config-rcconfig +Obsoletes: yast2-config-sysconfig +Provides: y2t_rc_config +Provides: yast2-trans-rcconfig +Provides: yast2-trans-sysconfig +Obsoletes: y2t_rc_config +Obsoletes: yast2-trans-rcconfig +Obsoletes: yast2-trans-sysconfig Summary: YaST2 - Sysconfig Editor +License: GPL-2.0+ +Group: System/YaST %description A graphical /etc/sysconfig/* editor with integrated search and context @@ -50,23 +59,23 @@ %setup -n yast2-sysconfig-%{version} %build -%{prefix}/bin/y2tool y2autoconf -%{prefix}/bin/y2tool y2automake +%{_prefix}/bin/y2tool y2autoconf +%{_prefix}/bin/y2tool y2automake autoreconf --force --install export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" %{?suse_update_config:%{suse_update_config -f}} -./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} +./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) # so that RPM_OPT_FLAGS check works make %{?jobs:-j%jobs} V=1 %install make install DESTDIR="$RPM_BUILD_ROOT" -[ -e "%{prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT" -for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name "*.desktop"` ; do +[ -e "%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT" +for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/ -name "*.desktop"` ; do d=${f##*/} %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} done @@ -82,11 +91,11 @@ /usr/share/YaST2/clients/sysconfig_*.ycp /usr/share/YaST2/modules/Sysconfig.ycp /usr/share/YaST2/modules/Sysconfig.ybc -%{prefix}/share/applications/YaST2/sysconfig.desktop -%{prefix}/lib/YaST2/bin/parse_configs.pl +%{_prefix}/share/applications/YaST2/sysconfig.desktop +%{_prefix}/lib/YaST2/bin/parse_configs.pl /usr/share/YaST2/data/sysedit.agent /usr/share/YaST2/data/descriptions /usr/share/YaST2/schema/autoyast/rnc/sysconfig.rnc -%doc %{prefix}/share/doc/packages/yast2-sysconfig +%doc %{_prefix}/share/doc/packages/yast2-sysconfig %changelog ++++++ yast2-sysconfig-2.21.2.tar.bz2 -> yast2-sysconfig-2.22.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-sysconfig-2.21.2/Makefile.am new/yast2-sysconfig-2.22.0/Makefile.am --- old/yast2-sysconfig-2.21.2/Makefile.am 2011-09-27 10:44:39.000000000 +0200 +++ new/yast2-sysconfig-2.22.0/Makefile.am 2012-03-30 16:24:09.000000000 +0200 @@ -20,7 +20,6 @@ IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) COPYRIGHT_files_gpl = README COPYING @@ -155,7 +154,7 @@ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ done -package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local +package: check-up-to-date check-tagversion check-textdomain package-local TAGVERSION = $(Y2TOOL) tagversion @@ -185,21 +184,6 @@ check-parse: @echo "Not running parseycp." -check-all-packages: - @if [ ! -e "$(ALL_PACKAGES)" ]; then \ - echo ERROR: "Can't find $(ALL_PACKAGES)"; false; \ - fi - @if ! grep -q "^$(RPMNAME)[[:space:]]" $(ALL_PACKAGES); then \ - echo ERROR: "$(RPMNAME) not in $(ALL_PACKAGES)"; false; \ - fi - @if grep -q "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); then \ - echo ERROR: "$(RPMNAME) info in $(ALL_PACKAGES) contains some unknown (?) fields:"; \ - echo; \ - grep "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); \ - echo; \ - false; \ - fi - check-textdomain: $(Y2TOOL) check-textdomain $(srcdir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-sysconfig-2.21.2/Makefile.in new/yast2-sysconfig-2.22.0/Makefile.in --- old/yast2-sysconfig-2.21.2/Makefile.in 2011-09-27 10:44:42.000000000 +0200 +++ new/yast2-sysconfig-2.22.0/Makefile.in 2012-03-30 16:24:12.000000000 +0200 @@ -261,7 +261,6 @@ # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) COPYRIGHT_files_gpl = README COPYING COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ @@ -902,7 +901,7 @@ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ done -package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local +package: check-up-to-date check-tagversion check-textdomain package-local check-up-to-date check-cvs-up-to-date check-svn-up-to-date: if [ -d $(srcdir)/CVS ]; then \ @@ -930,21 +929,6 @@ check-parse: @echo "Not running parseycp." -check-all-packages: - @if [ ! -e "$(ALL_PACKAGES)" ]; then \ - echo ERROR: "Can't find $(ALL_PACKAGES)"; false; \ - fi - @if ! grep -q "^$(RPMNAME)[[:space:]]" $(ALL_PACKAGES); then \ - echo ERROR: "$(RPMNAME) not in $(ALL_PACKAGES)"; false; \ - fi - @if grep -q "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); then \ - echo ERROR: "$(RPMNAME) info in $(ALL_PACKAGES) contains some unknown (?) fields:"; \ - echo; \ - grep "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); \ - echo; \ - false; \ - fi - check-textdomain: $(Y2TOOL) check-textdomain $(srcdir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-sysconfig-2.21.2/VERSION new/yast2-sysconfig-2.22.0/VERSION --- old/yast2-sysconfig-2.21.2/VERSION 2011-09-27 10:43:57.000000000 +0200 +++ new/yast2-sysconfig-2.22.0/VERSION 2012-03-30 16:19:42.000000000 +0200 @@ -1 +1 @@ -2.21.2 +2.22.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-sysconfig-2.21.2/configure new/yast2-sysconfig-2.22.0/configure --- old/yast2-sysconfig-2.21.2/configure 2011-09-27 10:44:41.000000000 +0200 +++ new/yast2-sysconfig-2.22.0/configure 2012-03-30 16:24:11.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for yast2-sysconfig 2.21.2. +# Generated by GNU Autoconf 2.68 for yast2-sysconfig 2.22.0. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-sysconfig' PACKAGE_TARNAME='yast2-sysconfig' -PACKAGE_VERSION='2.21.2' -PACKAGE_STRING='yast2-sysconfig 2.21.2' +PACKAGE_VERSION='2.22.0' +PACKAGE_STRING='yast2-sysconfig 2.22.0' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1229,7 +1229,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-sysconfig 2.21.2 to adapt to many kinds of systems. +\`configure' configures yast2-sysconfig 2.22.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1300,7 +1300,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-sysconfig 2.21.2:";; + short | recursive ) echo "Configuration of yast2-sysconfig 2.22.0:";; esac cat <<\_ACEOF @@ -1380,7 +1380,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-sysconfig configure 2.21.2 +yast2-sysconfig configure 2.22.0 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1397,7 +1397,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-sysconfig $as_me 2.21.2, which was +It was created by yast2-sysconfig $as_me 2.22.0, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2327,7 +2327,7 @@ # Define the identity of the package. PACKAGE='yast2-sysconfig' - VERSION='2.21.2' + VERSION='2.22.0' cat >>confdefs.h <<_ACEOF @@ -2449,7 +2449,7 @@ -VERSION="2.21.2" +VERSION="2.22.0" RPMNAME="yast2-sysconfig" MAINTAINER="Ladislav Slezak <lslezak@suse.cz>" @@ -3379,7 +3379,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-sysconfig $as_me 2.21.2, which was +This file was extended by yast2-sysconfig $as_me 2.22.0, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3432,7 +3432,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-sysconfig config.status 2.21.2 +yast2-sysconfig config.status 2.22.0 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-sysconfig-2.21.2/configure.in new/yast2-sysconfig-2.22.0/configure.in --- old/yast2-sysconfig-2.21.2/configure.in 2011-09-27 10:44:39.000000000 +0200 +++ new/yast2-sysconfig-2.22.0/configure.in 2012-03-30 16:24:09.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-sysconfig dnl -dnl -- This file is generated by y2autoconf 2.21.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.21.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-sysconfig, 2.21.2, http://bugs.opensuse.org/, yast2-sysconfig) +AC_INIT(yast2-sysconfig, 2.22.0, http://bugs.opensuse.org/, yast2-sysconfig) 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.21.2" +VERSION="2.22.0" RPMNAME="yast2-sysconfig" MAINTAINER="Ladislav Slezak <lslezak@suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-sysconfig-2.21.2/src/complex.ycp new/yast2-sysconfig-2.22.0/src/complex.ycp --- old/yast2-sysconfig-2.21.2/src/complex.ycp 2011-09-27 10:45:34.000000000 +0200 +++ new/yast2-sysconfig-2.22.0/src/complex.ycp 2012-03-30 16:23:45.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Dialogs definitions * Authors: Ladislav Slezak <lslezak@suse.cz> * - * $Id: complex.ycp 66084 2011-09-27 08:45:32Z visnov $ + * $Id: complex.ycp 67837 2012-03-30 14:23:42Z lslezak $ */ { @@ -395,37 +395,9 @@ return nil; } - string ret = ""; - integer index = 0; - boolean backslash = false; + string ret = regexpsub(input, "(.*)\\([^$].*)", "\\1\\2"); - while (index < size(input)) - { - string ch = substring(input, index, 1); - string ch_1 = substring(input, index + 1, 1); - - if (backslash == false) - { - // don't remove backslash before \$ (#34809) - if (ch == "\\" && ch_1 != nil && ch_1 != "$") - { - backslash = true; - } - else - { - ret = ret + ch; - } - } - else - { - ret = ret + ch; - backslash = false; - } - - index = index + 1; - } - - return ret; + return (ret == nil) ? input : ret; } /** @@ -444,7 +416,7 @@ value = (haskey(description, "Default")) ? description["Default"]:"" : ""; } - if (description["actions","SingleQt"]:"" == "") + if (description["actions","SingleQt"]:"" == "1") { new_value = backslash_remove(new_value); value = backslash_remove(value); @@ -608,7 +580,7 @@ map d = Sysconfig::get_description(selected_variable); // check whether single quotes are used in the configuration file - if (d["actions", "SingleQt"]:"" == "") + if (d["actions", "SingleQt"]:"" == "1") { new_value = backslash_add(new_value); } @@ -754,7 +726,7 @@ ), `VSpacing(1), // help rich text displayed after module start (1/2) - `RichText(`id(`rt), _("<P><B>System Configuration Editor</B></P><P>With the system configuration editor, you can change some system settings. You can also use YaST2 to configure your hardware and system settings.</P>") + + `RichText(`id(`rt), _("<P><B>System Configuration Editor</B></P><P>With the system configuration editor, you can change some system settings. You can also use YaST to configure your hardware and system settings.</P>") + // help rich text displayed after module start (2/2) _("<P><B>Note:</B> Descriptions are not translated because they are read directly from configuration files.</P>")), // push button label - displayed only in autoinstallation config mode -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org