openSUSE Commits
Threads by month
- ----- 2025 -----
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
December 2006
- 1 participants
- 554 discussions
Hello community,
here is the log from the commit of package yast2-packager
checked in at Thu Dec 7 21:42:55 CET 2006.
--------
--- yast2-packager/yast2-packager.changes 2006-11-22 13:43:02.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2006-11-29 12:25:06.000000000 +0100
@@ -1,0 +2,10 @@
+Wed Nov 29 08:36:17 CET 2006 - lslezak(a)suse.cz
+
+- use Report::LongError(), the error message might be very long
+ (esp. important in ncurses UI) (#222893)
+- do not install "mol" and "sudo" on ppc (#222906)
+- install "xen-tools" in a Xen VM (required for registration)
+ (#223643)
+- 2.15.0
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.14.10.tar.bz2
New:
----
yast2-packager-2.15.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.oiVUmu/_old 2006-12-07 21:42:42.000000000 +0100
+++ /var/tmp/diff_new_pack.oiVUmu/_new 2006-12-07 21:42:42.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.14.10)
+# spec file for package yast2-packager (Version 2.15.0)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-packager
-Version: 2.14.10
+Version: 2.15.0
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.14.10.tar.bz2
+Source0: yast2-packager-2.15.0.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-slp yast2-testsuite yast2-xml
Requires: checkmedia yast2-country
@@ -46,7 +46,7 @@
Arvin Schnell <arvin(a)suse.de>
%prep
-%setup -n yast2-packager-2.14.10
+%setup -n yast2-packager-2.15.0
%build
%{prefix}/bin/y2tool y2autoconf
@@ -84,6 +84,13 @@
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog -n yast2-packager
+* Wed Nov 29 2006 - lslezak(a)suse.cz
+- use Report::LongError(), the error message might be very long
+ (esp. important in ncurses UI) (#222893)
+- do not install "mol" and "sudo" on ppc (#222906)
+- install "xen-tools" in a Xen VM (required for registration)
+ (#223643)
+- 2.15.0
* Wed Nov 22 2006 - lslezak(a)suse.cz
- removed the workaround for #202088 (target is reloaded
automaticaly, removed the unnecessary reload)
++++++ yast2-packager-2.14.10.tar.bz2 -> yast2-packager-2.15.0.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.14.10/VERSION new/yast2-packager-2.15.0/VERSION
--- old/yast2-packager-2.14.10/VERSION 2006-11-22 13:14:27.000000000 +0100
+++ new/yast2-packager-2.15.0/VERSION 2006-11-29 11:25:44.000000000 +0100
@@ -1 +1 @@
-2.14.10
+2.15.0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.14.10/configure new/yast2-packager-2.15.0/configure
--- old/yast2-packager-2.14.10/configure 2006-11-22 13:39:21.000000000 +0100
+++ new/yast2-packager-2.15.0/configure 2006-11-29 12:23:35.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2-packager 2.14.10.
+# Generated by GNU Autoconf 2.60 for yast2-packager 2.15.0.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-packager'
PACKAGE_TARNAME='yast2-packager'
-PACKAGE_VERSION='2.14.10'
-PACKAGE_STRING='yast2-packager 2.14.10'
+PACKAGE_VERSION='2.15.0'
+PACKAGE_STRING='yast2-packager 2.15.0'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1180,7 +1180,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-packager 2.14.10 to adapt to many kinds of systems.
+\`configure' configures yast2-packager 2.15.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1251,7 +1251,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-packager 2.14.10:";;
+ short | recursive ) echo "Configuration of yast2-packager 2.15.0:";;
esac
cat <<\_ACEOF
@@ -1329,7 +1329,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-packager configure 2.14.10
+yast2-packager configure 2.15.0
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1343,7 +1343,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-packager $as_me 2.14.10, which was
+It was created by yast2-packager $as_me 2.15.0, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2144,7 +2144,7 @@
# Define the identity of the package.
PACKAGE='yast2-packager'
- VERSION='2.14.10'
+ VERSION='2.15.0'
cat >>confdefs.h <<_ACEOF
@@ -2371,7 +2371,7 @@
-VERSION="2.14.10"
+VERSION="2.15.0"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>"
@@ -3229,7 +3229,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-packager $as_me 2.14.10, which was
+This file was extended by yast2-packager $as_me 2.15.0, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3272,7 +3272,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-packager config.status 2.14.10
+yast2-packager config.status 2.15.0
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.14.10/configure.in new/yast2-packager-2.15.0/configure.in
--- old/yast2-packager-2.14.10/configure.in 2006-11-22 13:39:15.000000000 +0100
+++ new/yast2-packager-2.15.0/configure.in 2006-11-29 12:23:30.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-packager, 2.14.10, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.15.0, http://bugs.opensuse.org/, yast2-packager)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.14.10"
+VERSION="2.15.0"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.14.10/src/clients/sw_single.ycp new/yast2-packager-2.15.0/src/clients/sw_single.ycp
--- old/yast2-packager-2.14.10/src/clients/sw_single.ycp 2006-11-22 13:38:48.000000000 +0100
+++ new/yast2-packager-2.15.0/src/clients/sw_single.ycp 2006-11-29 08:41:40.000000000 +0100
@@ -7,7 +7,7 @@
* Purpose: contains dialog loop for workflows:
* "Install/Remove software"
*
- * $Id: sw_single.ycp 34559 2006-11-22 12:38:46Z lslezak $
+ * $Id: sw_single.ycp 34619 2006-11-29 07:41:37Z lslezak $
*/
{
@@ -341,7 +341,7 @@
string missing = mergestring (nonexisting, ", ");
y2error ("Tags %1 aren't available",
mergestring (nonexisting, ", "));
- Report::Error (sformat (
+ Report::LongError (sformat (
// error report, %1 is a list of packages
_("Following packages haven't been found on the medium:\n%1"),
mergestring (nonexisting, "\n")));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.14.10/src/modules/Packages.ycp new/yast2-packager-2.15.0/src/modules/Packages.ycp
--- old/yast2-packager-2.14.10/src/modules/Packages.ycp 2006-11-22 09:26:06.000000000 +0100
+++ new/yast2-packager-2.15.0/src/modules/Packages.ycp 2006-11-29 08:52:19.000000000 +0100
@@ -3,7 +3,7 @@
* Package: Package selections
* Authors: Anas Nashif <nashif(a)suse.de>
*
- * $Id: Packages.ycp 34552 2006-11-22 08:26:03Z lslezak $
+ * $Id: Packages.ycp 34621 2006-11-29 07:52:17Z lslezak $
*/
{
@@ -397,10 +397,6 @@
packages = add (packages, "pbbuttonsd");
packages = add (packages, "powerprefs");
}
-
- // mol is fun, and needs root access to kmem
- packages = add (packages, "mol");
- packages = add (packages, "sudo");
}
if (Arch::ppc64 () && (Arch::board_chrp () || Arch::board_iseries ()))
@@ -418,6 +414,12 @@
}
}
+ if (Arch::is_xenU())
+ {
+ // xen-tools are required for registration of a Xen VM
+ packages = add (packages, "xen-tools");
+ }
+
// add numactl on x86_64 with SMP
if (Arch::has_smp () && Arch::x86_64 ())
{
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package yast2-network
checked in at Thu Dec 7 21:42:48 CET 2006.
--------
--- yast2-network/yast2-network.changes 2006-11-29 15:03:28.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2006-12-06 16:43:00.000000000 +0100
@@ -1,0 +2,12 @@
+Wed Dec 6 16:38:33 CET 2006 - mzugec(a)suse.cz
+
+- #226408 - Network card -> IPv6 configuration: cannot go back
+- 2.15.1
+
+-------------------------------------------------------------------
+Wed Dec 6 15:08:38 CET 2006 - mzugec(a)suse.cz
+
+- #224884 - avoid some unwished error message (brctl)
+- 2.15.0
+
+-------------------------------------------------------------------
Old:
----
yast2-network-2.14.12.tar.bz2
New:
----
yast2-network-2.15.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.Xwdlja/_old 2006-12-07 21:42:35.000000000 +0100
+++ /var/tmp/diff_new_pack.Xwdlja/_new 2006-12-07 21:42:35.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-network (Version 2.14.12)
+# spec file for package yast2-network (Version 2.15.1)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-network
-Version: 2.14.12
+Version: 2.15.1
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.14.12.tar.bz2
+Source0: yast2-network-2.15.1.tar.bz2
prefix: /usr
# should be required by devtools
BuildRequires: perl-XML-Writer pkgconfig
@@ -51,7 +51,7 @@
Michal Svec <msvec(a)suse.cz>
%prep
-%setup -n yast2-network-2.14.12
+%setup -n yast2-network-2.15.1
%build
%{prefix}/bin/y2tool y2autoconf
@@ -107,6 +107,12 @@
/usr/share/YaST2/schema/autoyast/rnc/proxy.rnc
%changelog -n yast2-network
+* Wed Dec 06 2006 - mzugec(a)suse.cz
+- #226408 - Network card -> IPv6 configuration: cannot go back
+- 2.15.1
+* Wed Dec 06 2006 - mzugec(a)suse.cz
+- #224884 - avoid some unwished error message (brctl)
+- 2.15.0
* Wed Nov 29 2006 - kmachalkova(a)suse.cz
- Correct check for availability of wireless firmware packages
(#223871)
++++++ yast2-network-2.14.12.tar.bz2 -> yast2-network-2.15.1.tar.bz2 ++++++
++++ 12309 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.14.12/Makefile.am new/yast2-network-2.15.1/Makefile.am
--- old/yast2-network-2.14.12/Makefile.am 2006-11-29 14:24:26.000000000 +0100
+++ new/yast2-network-2.15.1/Makefile.am 2006-12-06 16:16:14.000000000 +0100
@@ -7,7 +7,8 @@
#
#where devtools are
-Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool
+PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
+Y2TOOL = $(PREFIX)/bin/y2tool
VERSION = $(shell cat $(srcdir)/VERSION)
RPMNAME = $(shell cat $(srcdir)/RPMNAME)
@@ -19,7 +20,7 @@
# 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)
+DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(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)
@@ -33,7 +34,7 @@
AUTOMAKE_OPTIONS = foreign dist-bzip2
# where devtools instal m4 snippets
# argh, executed literally
-#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
+#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal
ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common
@@ -66,7 +67,7 @@
# because the prerequisite is made here (not anymore!)
# and we don't want any paths in y2autoconf
# info '(autoconf)config.status Invocation'
-$(RPMNAME).pc: $(RPMNAME).pc.in config.status
+$(RPMNAME).pc: $(RPMNAME).pc.in
./config.status --file=$@:$<
if CREATE_PKGCONFIG_NOARCH
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.14.12/Makefile.am.common new/yast2-network-2.15.1/Makefile.am.common
--- old/yast2-network-2.14.12/Makefile.am.common 2006-11-29 14:24:26.000000000 +0100
+++ new/yast2-network-2.15.1/Makefile.am.common 2006-12-06 16:16:13.000000000 +0100
@@ -29,19 +29,7 @@
dist-hook: check-syntax
-CHECK_SYNTAX = true
check-syntax: $(client_DATA) $(ycpchook)
- @if test "$(client_DATA)"; then \
- if $(CHECK_SYNTAX); then \
- TO_CHECK="$(filter %.ycp,$^)"; \
- echo "Checking syntax of $${TO_CHECK}"; \
- if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \
- echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \
- exit 1; \
- fi; \
- else \
- echo "Syntax check disabled"; \
- fi; \
- fi
+ if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi
-include .dep
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.14.12/VERSION new/yast2-network-2.15.1/VERSION
--- old/yast2-network-2.14.12/VERSION 2006-11-29 14:26:20.000000000 +0100
+++ new/yast2-network-2.15.1/VERSION 2006-12-06 16:38:31.000000000 +0100
@@ -1 +1 @@
-2.14.12
+2.15.1
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.14.12/configure.in new/yast2-network-2.15.1/configure.in
--- old/yast2-network-2.14.12/configure.in 2006-11-29 14:24:26.000000000 +0100
+++ new/yast2-network-2.15.1/configure.in 2006-12-06 16:16:12.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-network
dnl
-dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.21 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-network, 2.14.11, http://bugs.opensuse.org/, yast2-network)
+AC_INIT(yast2-network, 2.15.0, http://bugs.opensuse.org/, yast2-network)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.14.11"
+VERSION="2.15.0"
RPMNAME="yast2-network"
MAINTAINER="Michal Zugec <mzugec(a)suse.cz>"
@@ -110,8 +110,6 @@
AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
fi
-Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
-AC_SUBST(Y2DEVTOOLS_PREFIX)
devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools`
devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools`
@@ -144,9 +142,6 @@
if test "$YCPC" = "false"; then
AC_MSG_ERROR([ycpc is not installed])
fi
-AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [
- AC_MSG_WARN([yast2-testsuite.rpm is not installed])
-])
AC_CONFIG_FILES(Makefile agents/Makefile
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.14.12/src/lan/complex.ycp new/yast2-network-2.15.1/src/lan/complex.ycp
--- old/yast2-network-2.14.12/src/lan/complex.ycp 2006-11-29 14:54:10.000000000 +0100
+++ new/yast2-network-2.15.1/src/lan/complex.ycp 2006-12-06 16:39:00.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Summary, overview and IO dialogs for network cards config
* Authors: Michal Svec <msvec(a)suse.cz>
*
- * $Id: complex.ycp 34638 2006-11-29 13:54:08Z kmachalkova $
+ * $Id: complex.ycp 34816 2006-12-06 15:38:58Z mzugec $
*/
{
@@ -274,7 +274,7 @@
"back_button" : Label::BackButton (),
"next_button" : Label::NextButton (),
// #54027
- "disable_buttons" : (Mode::normal ()? ["back_button"] : []),
+// "disable_buttons" : (Mode::normal ()? ["back_button"] : []),
"fallback_functions" : functions,
]);
// #148485: always show the device overview
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.14.12/src/lan/wizards.ycp new/yast2-network-2.15.1/src/lan/wizards.ycp
--- old/yast2-network-2.14.12/src/lan/wizards.ycp 2006-10-24 18:38:58.000000000 +0200
+++ new/yast2-network-2.15.1/src/lan/wizards.ycp 2006-12-06 16:39:00.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Network cards configuration wizards
* Authors: Michal Svec <msvec(a)suse.cz>
*
- * $Id: wizards.ycp 33562 2006-10-23 08:33:20Z mzugec $
+ * $Id: wizards.ycp 34816 2006-12-06 15:38:58Z mzugec $
*/
{
@@ -290,6 +290,7 @@
`next : "address",
],
"ipv6" : $[
+ `back : `back,
`abort : `abort,
`next : "address",
],
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.14.12/src/modules/Lan.ycp new/yast2-network-2.15.1/src/modules/Lan.ycp
--- old/yast2-network-2.14.12/src/modules/Lan.ycp 2006-11-07 17:03:44.000000000 +0100
+++ new/yast2-network-2.15.1/src/modules/Lan.ycp 2006-12-06 15:08:59.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Network card data
* Authors: Michal Svec <msvec(a)suse.cz>
*
- * $Id: Lan.ycp 34009 2006-11-03 10:22:34Z mzugec $
+ * $Id: Lan.ycp 34800 2006-12-06 14:08:57Z mzugec $
*
* Representation of the configuration of network cards.
* Input and output routines.
@@ -1937,7 +1937,7 @@
* @return whether xenbr* exists
*/
global define boolean HaveXenBridge () {
- string cmd = "brctl show | grep '^xenbr'";
+ string cmd = "which brctl && ( brctl show | grep '^xenbr' )";
boolean have_br = SCR::Execute (.target.bash, cmd) == 0;
y2milestone ("Have Xen bridge: %1", have_br);
return have_br;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package yast2-ncurses
checked in at Thu Dec 7 21:42:24 CET 2006.
--------
--- yast2-ncurses/yast2-ncurses.changes 2006-11-29 17:04:49.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-ncurses/yast2-ncurses.changes 2006-12-05 10:12:03.000000000 +0100
@@ -1,0 +2,8 @@
+Tue Dec 5 09:52:49 CET 2006 - kmachalkova(a)suse.cz
+
+- Use the same color palette - 8 colors - for all terminals (thanks
+ to tiwai) (#221614)
+- Highlight keyboard shortcuts in mono theme (#224892)
+- 2.15.0
+
+-------------------------------------------------------------------
Old:
----
yast2-ncurses-2.14.4.tar.bz2
New:
----
yast2-ncurses-2.15.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ncurses.spec ++++++
--- /var/tmp/diff_new_pack.0n6Qmh/_old 2006-12-07 21:41:38.000000000 +0100
+++ /var/tmp/diff_new_pack.0n6Qmh/_new 2006-12-07 21:41:38.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-ncurses (Version 2.14.4)
+# spec file for package yast2-ncurses (Version 2.15.0)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-ncurses
-Version: 2.14.4
+Version: 2.15.0
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ncurses-2.14.4.tar.bz2
+Source0: yast2-ncurses-2.15.0.tar.bz2
prefix: /usr
BuildRequires: doxygen gcc-c++ libzypp-devel yast2-core-devel yast2-devtools
BuildRequires: blocxx-devel libxcrypt-devel
@@ -42,7 +42,7 @@
%prep
-%setup -n yast2-ncurses-2.14.4
+%setup -n yast2-ncurses-2.15.0
%build
%{prefix}/bin/y2tool y2autoconf
@@ -75,6 +75,11 @@
%doc %{prefix}/share/doc/packages/yast2-ncurses
%changelog -n yast2-ncurses
+* Tue Dec 05 2006 - kmachalkova(a)suse.cz
+- Use the same color palette - 8 colors - for all terminals (thanks
+ to tiwai) (#221614)
+- Highlight keyboard shortcuts in mono theme (#224892)
+- 2.15.0
* Wed Nov 29 2006 - kmachalkova(a)suse.cz
- Display updated patches also in 'installable' view (not only in
'installed' one) (#223416)
++++++ yast2-ncurses-2.14.4.tar.bz2 -> yast2-ncurses-2.15.0.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.14.4/VERSION new/yast2-ncurses-2.15.0/VERSION
--- old/yast2-ncurses-2.14.4/VERSION 2006-11-29 16:54:55.000000000 +0100
+++ new/yast2-ncurses-2.15.0/VERSION 2006-12-05 09:59:38.000000000 +0100
@@ -1 +1 @@
-2.14.4
+2.15.0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.14.4/configure new/yast2-ncurses-2.15.0/configure
--- old/yast2-ncurses-2.14.4/configure 2006-11-29 16:57:10.000000000 +0100
+++ new/yast2-ncurses-2.15.0/configure 2006-12-05 09:59:57.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2-ncurses 2.14.4.
+# Generated by GNU Autoconf 2.60 for yast2-ncurses 2.15.0.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -713,8 +713,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-ncurses'
PACKAGE_TARNAME='yast2-ncurses'
-PACKAGE_VERSION='2.14.4'
-PACKAGE_STRING='yast2-ncurses 2.14.4'
+PACKAGE_VERSION='2.15.0'
+PACKAGE_STRING='yast2-ncurses 2.15.0'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1421,7 +1421,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-ncurses 2.14.4 to adapt to many kinds of systems.
+\`configure' configures yast2-ncurses 2.15.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1492,7 +1492,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-ncurses 2.14.4:";;
+ short | recursive ) echo "Configuration of yast2-ncurses 2.15.0:";;
esac
cat <<\_ACEOF
@@ -1600,7 +1600,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-ncurses configure 2.14.4
+yast2-ncurses configure 2.15.0
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1614,7 +1614,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-ncurses $as_me 2.14.4, which was
+It was created by yast2-ncurses $as_me 2.15.0, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2415,7 +2415,7 @@
# Define the identity of the package.
PACKAGE='yast2-ncurses'
- VERSION='2.14.4'
+ VERSION='2.15.0'
cat >>confdefs.h <<_ACEOF
@@ -2642,7 +2642,7 @@
-VERSION="2.14.4"
+VERSION="2.15.0"
RPMNAME="yast2-ncurses"
MAINTAINER="Katarina Machalkova <kmachalkova(a)suse.cz>"
@@ -21648,7 +21648,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-ncurses $as_me 2.14.4, which was
+This file was extended by yast2-ncurses $as_me 2.15.0, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21701,7 +21701,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-ncurses config.status 2.14.4
+yast2-ncurses config.status 2.15.0
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.14.4/configure.in new/yast2-ncurses-2.15.0/configure.in
--- old/yast2-ncurses-2.14.4/configure.in 2006-11-29 16:56:59.000000000 +0100
+++ new/yast2-ncurses-2.15.0/configure.in 2006-12-05 09:59:44.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-ncurses, 2.14.4, http://bugs.opensuse.org/, yast2-ncurses)
+AC_INIT(yast2-ncurses, 2.15.0, http://bugs.opensuse.org/, yast2-ncurses)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.14.4"
+VERSION="2.15.0"
RPMNAME="yast2-ncurses"
MAINTAINER="Katarina Machalkova <kmachalkova(a)suse.cz>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.14.4/src/NCstyle.cc new/yast2-ncurses-2.15.0/src/NCstyle.cc
--- old/yast2-ncurses-2.14.4/src/NCstyle.cc 2006-10-31 16:07:10.000000000 +0100
+++ new/yast2-ncurses-2.15.0/src/NCstyle.cc 2006-12-05 10:08:49.000000000 +0100
@@ -28,6 +28,11 @@
#include "NCstyle.linux.h"
#include "NCstyle.xterm.h"
+
+//initialize number of colors and color pairs
+int NCattribute::_colors = ::COLORS;
+int NCattribute::_pairs = ::COLOR_PAIRS;
+
///////////////////////////////////////////////////////////////////
//
// CLASS NAME : NCstyle::Style
@@ -301,7 +306,7 @@
if ( getenv( "Y2_BRAILLE" ) != NULL ) {
styleName = "braille";
} else {
- if ( term_t == "xterm" )
+ if ( term_t == "xterm-256color" )
styleName = "xterm";
}
} else {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.14.4/src/NCstyle.h new/yast2-ncurses-2.15.0/src/NCstyle.h
--- old/yast2-ncurses-2.14.4/src/NCstyle.h 2006-10-31 16:07:11.000000000 +0100
+++ new/yast2-ncurses-2.15.0/src/NCstyle.h 2006-12-04 17:32:00.000000000 +0100
@@ -39,8 +39,17 @@
//
// available colors and color pairs
//
- inline static int colors() { return ::COLORS; }
- inline static int color_pairs() { return ::COLOR_PAIRS; }
+ static int _colors;
+ static int _pairs;
+
+ //if we have color support, return number of available colors
+ //(at most 8 though)
+ //will be initialized by init_color() function
+ inline static int colors() { return _colors ? _colors : ::COLORS; }
+ // do the same with color pairs
+ inline static int color_pairs() { return _pairs ? _pairs : ::COLOR_PAIRS; }
+
+ //
//
// color pair to chtype
//
@@ -88,6 +97,24 @@
friend class NCurses;
static void init_colors() {
+
+ //get number of available colors (property of the terminal)
+ //the same with color pairs
+
+ _colors = ::COLORS;
+ _pairs = ::COLOR_PAIRS;
+
+ //if we have more than 8 colors available, use only 8 anyway
+ //in order to preserve the same color palette even for
+ //e.g. 256color terminal
+
+ if ( _colors > COLOR_WHITE + 1 )
+ //_colors = 8 at all times
+ _colors = COLOR_WHITE + 1;
+ if ( _pairs > _colors * _colors )
+ //_pairs == 64 at all times
+ _pairs = _colors * _colors;
+
for ( short i = 1; i < color_pairs(); ++i )
::init_pair( i, fg_color_pair( i ), bg_color_pair( i ) );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.14.4/src/NCstyle.mono.h new/yast2-ncurses-2.15.0/src/NCstyle.mono.h
--- old/yast2-ncurses-2.14.4/src/NCstyle.mono.h 2006-10-31 16:07:13.000000000 +0100
+++ new/yast2-ncurses-2.15.0/src/NCstyle.mono.h 2006-12-01 11:04:13.000000000 +0100
@@ -44,7 +44,7 @@
attrset->setAttr( NCstyle::DialogPlain, 0|A_REVERSE|A_BOLD );
attrset->setAttr( NCstyle::DialogLabel, 0|A_REVERSE|A_BOLD );
attrset->setAttr( NCstyle::DialogData, 0|A_REVERSE );
- attrset->setAttr( NCstyle::DialogHint, 0|A_REVERSE );
+ attrset->setAttr( NCstyle::DialogHint, 0|A_REVERSE|A_BOLD );
attrset->setAttr( NCstyle::DialogScrl, 0|A_REVERSE|A_BOLD );
attrset->setAttr( NCstyle::DialogActivePlain, 0 );
attrset->setAttr( NCstyle::DialogActiveLabel, 0 );
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package yast2-core
checked in at Thu Dec 7 21:41:31 CET 2006.
--------
--- yast2-core/yast2-core.changes 2006-10-31 16:58:12.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-core/yast2-core.changes 2006-12-06 17:05:48.000000000 +0100
@@ -1,0 +2,20 @@
+Tue Dec 5 10:31:13 CET 2006 - kmachalkova(a)suse.cz
+
+- Added RunInTerminal UI builtin for running external programs from
+ ncurses UI (#148683, #221254, #222547)
+- 2.15.1
+
+-------------------------------------------------------------------
+Tue Dec 5 10:54:41 CET 2006 - mvidner(a)suse.cz
+
+- ini-agent with repeat_names: do not merge sections with same name
+ when parsing. They can be accessed using .all. (#224414)
+
+-------------------------------------------------------------------
+Tue Dec 5 08:45:30 CET 2006 - mvidner(a)suse.cz
+
+- Do not abort if a nonterm is passed to `ReplacePoint or `*Squash
+ (#225815).
+- 2.15.0
+
+-------------------------------------------------------------------
Old:
----
yast2-core-2.14.4.tar.bz2
New:
----
yast2-core-2.15.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-core.spec ++++++
--- /var/tmp/diff_new_pack.9vWyja/_old 2006-12-07 21:41:09.000000000 +0100
+++ /var/tmp/diff_new_pack.9vWyja/_new 2006-12-07 21:41:09.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-core (Version 2.14.4)
+# spec file for package yast2-core (Version 2.15.1)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-core
-Version: 2.14.4
+Version: 2.15.1
Release: 1
-License: GNU General Public License (GPL) - all versions
+License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-core-2.14.4.tar.bz2
+Source0: yast2-core-2.15.1.tar.bz2
prefix: /usr
# obviously
BuildRequires: gcc-c++
@@ -114,7 +114,7 @@
Stanislav Visnovsky <visnov(a)suse.cz>
%prep
-%setup -n yast2-core-2.14.4
+%setup -n yast2-core-2.15.1
%build
%{prefix}/bin/y2tool y2autoconf
@@ -186,6 +186,17 @@
/usr/share/YaST2/data/devtools/bin/generateYCPWrappers
%changelog -n yast2-core
+* Tue Dec 05 2006 - mvidner(a)suse.cz
+- ini-agent with repeat_names: do not merge sections with same name
+ when parsing. They can be accessed using .all. (#224414)
+* Tue Dec 05 2006 - kmachalkova(a)suse.cz
+- Added RunInTerminal UI builtin for running external programs from
+ ncurses UI (#148683, #221254, #222547)
+- 2.15.1
+* Tue Dec 05 2006 - mvidner(a)suse.cz
+- Do not abort if a nonterm is passed to `ReplacePoint or `*Squash
+ (#225815).
+- 2.15.0
* Tue Oct 31 2006 - mvidner(a)suse.cz
- ini-agent: use C locale when building regular expressions so that
A-Z works for Estonian (#177560).
++++++ yast2-core-2.14.4.tar.bz2 -> yast2-core-2.15.1.tar.bz2 ++++++
++++ 36813 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.14.4/VERSION new/yast2-core-2.15.1/VERSION
--- old/yast2-core-2.14.4/VERSION 2006-10-31 16:49:26.000000000 +0100
+++ new/yast2-core-2.15.1/VERSION 2006-12-05 10:30:59.000000000 +0100
@@ -1 +1 @@
-2.14.4
+2.15.1
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.14.4/agent-ini/src/IniFile.cc new/yast2-core-2.15.1/agent-ini/src/IniFile.cc
--- old/yast2-core-2.14.4/agent-ini/src/IniFile.cc 2006-09-19 14:20:01.000000000 +0200
+++ new/yast2-core-2.15.1/agent-ini/src/IniFile.cc 2006-12-06 16:02:44.000000000 +0100
@@ -8,7 +8,7 @@
* Petr Blahos <pblahos(a)suse.cz>
* Martin Vidner <mvidner(a)suse.cz>
*
- * $Id: IniFile.cc 32969 2006-09-19 12:21:30Z mvidner $
+ * $Id: IniFile.cc 34764 2006-12-05 10:02:13Z mvidner $
*/
#include <ycp/y2log.h>
@@ -105,7 +105,7 @@
ivalues.insert (IniEntryIndex::value_type (k, --container.end ()));
}
-void IniSection::initSection (const string&name,const string&comment,int rb, int wb)
+IniSection& IniSection::initSection (const string&name,const string&comment,int rb, int wb)
{
string k = ip->changeCase (name);
@@ -141,6 +141,8 @@
container.push_back (ce);
// index it
isections.insert (IniSectionIndex::value_type (k, --container.end ()));
+ // return reference to the new copy(!)
+ return container.back().s();
}
IniSection& IniSection::findSection(const vector<string>&path, int from)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.14.4/agent-ini/src/IniFile.h new/yast2-core-2.15.1/agent-ini/src/IniFile.h
--- old/yast2-core-2.14.4/agent-ini/src/IniFile.h 2006-09-19 14:20:01.000000000 +0200
+++ new/yast2-core-2.15.1/agent-ini/src/IniFile.h 2006-12-06 16:02:44.000000000 +0100
@@ -8,7 +8,7 @@
* Petr Blahos <pblahos(a)suse.cz>
* Martin Vidner <mvidner(a)suse.cz>
*
- * $Id: IniFile.h 32969 2006-09-19 12:21:30Z mvidner $
+ * $Id: IniFile.h 34764 2006-12-05 10:02:13Z mvidner $
*/
#ifndef __IniFile_h__
@@ -493,8 +493,9 @@
* @param comment comment
* @param rb read-by
* @param wb rewrite-by. if -2 (default), it is not changed
+ * @return a reference to the section
*/
- void initSection (const string&name,const string&comment,int rb, int wb=-2);
+ IniSection& initSection (const string&name,const string&comment,int rb, int wb=-2);
/**
* This function has very special purpose, it ensures that top-section
* delimiter is not written when saving multiple files.
@@ -524,6 +525,7 @@
virtual void clean();
/**
+ * OBSOLETE, to be removed.
* Gets section on a path. Recursive. Attention! This function
* aborts when it doesn't find the section! Use with care!
* (Used only by IniParser::parse_helper)
@@ -533,6 +535,7 @@
*/
IniSection& findSection(const vector<string>&path, int from = 0);
/**
+ * OBSOLETE, to be removed.
* If currently parsed end-section-tag hasn't matched currently
* processed section by name, we need to find the best possible match
* by type (read_by). Hence we
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.14.4/agent-ini/src/IniParser.cc new/yast2-core-2.15.1/agent-ini/src/IniParser.cc
--- old/yast2-core-2.14.4/agent-ini/src/IniParser.cc 2006-10-31 16:58:23.000000000 +0100
+++ new/yast2-core-2.15.1/agent-ini/src/IniParser.cc 2006-12-06 16:02:44.000000000 +0100
@@ -8,7 +8,7 @@
* Petr Blahos <pblahos(a)suse.cz>
* Martin Vidner <mvidner(a)suse.cz>
*
- * $Id: IniParser.cc 33951 2006-10-31 15:58:21Z mvidner $
+ * $Id: IniParser.cc 34764 2006-12-05 10:02:13Z mvidner $
*/
#include "config.h"
@@ -537,8 +537,8 @@
string line;
size_t i;
- // stack of section names
- vector<string>path;
+ // stack of open sections, innermost at front
+ list<IniSection *> open_sections;
//
// read line
@@ -590,7 +590,7 @@
state = 0;
val = val + (join_multiline ? " " : "\n") + m[1];
line = m.rest;
- if (!path.size())
+ if (open_sections.empty ())
{ // we are in toplevel section, going deeper
// check for toplevel values allowance
if (!global_values)
@@ -598,10 +598,9 @@
else
ini.initValue (key, val, comment, matched_by);
}
- else
- {
- ini.findSection(path).initValue(key, val, comment, matched_by);
- }
+ else {
+ open_sections.front()->initValue(key, val, comment, matched_by);
+ }
comment = "";
}
else
@@ -628,25 +627,28 @@
if (i < sections.size ())
{
// section begin found !!! check conditions
- if (path.size())
+ if (!open_sections.empty())
{ // there were some sections
// is there need to close previous section?
- if (sectionNeedsEnd(ini.findSection(path).getReadBy()))
+ IniSection * cur = open_sections.front();
+ if (sectionNeedsEnd(cur->getReadBy()))
{
if(no_nested_sections)
{
scanner_error ("Section %s started but section %s is not finished",
found.c_str(),
- path[path.size()-1].c_str());
- path.pop_back();
+ cur->getName());
+ open_sections.pop_front();
}
}
else
- path.pop_back();
+ open_sections.pop_front();
}
- if (!path.size())
+
+ IniSection * parent = NULL;
+ if (open_sections.empty())
{ // we are in toplevel section, going deeper
- ini.initSection (found, comment, i);
+ parent = &ini;
}
else
{
@@ -654,11 +656,14 @@
scanner_error ("Attempt to create nested section %s.", found.c_str ());
else
{
- ini.findSection(path).initSection(found, comment, i);
+ parent = open_sections.front();
}
}
+
+ if (parent)
+ open_sections.push_front (& parent->initSection (found, comment, i));
+
comment = "";
- path.push_back(found);
}
} // check for section begin
@@ -687,51 +692,55 @@
// comment
if (!comment.empty ())
{
- if (!path.size())
+ if (open_sections.empty())
ini.setEndComment (comment.c_str ());
else
{
- ini.findSection(path).setEndComment (comment.c_str ());
+ open_sections.front()->setEndComment (comment.c_str ());
}
comment = "";
}
- if (!path.size ())
+ if (open_sections.empty ())
scanner_error ("Nothing to close.");
- else if (!found.empty ())
- { // there is a subexpression
- int len = path.size ();
- int j;
-
- for (j = len - 1; j >= 0;j--)
- if (path[j] == found)
- {
- path.resize (j);
+ else {
+ list<IniSection *>::iterator
+ b = open_sections.begin(),
+ e = open_sections.end(),
+ it;
+
+ string name_to_close = found;
+ bool complain = false;
+
+ if (!name_to_close.empty ())
+ { // there is a subexpression (section name)
+ for (it = b; it != e; ++it) {
+ if ((*it)->getName() == name_to_close)
break;
- }
- if (j == -1)
- { // we did not find, so close the first that needs it
- int m = ini.findEndFromUp (path, i);
- int toclose = len - 1;
- if (-1 != m)
- {
- toclose = m - 1;
- }
- scanner_error ("Unexpected closing %s. Closing section %s.", found.c_str(), path[toclose].c_str());
- path.resize (toclose);
+ }
+
+ if (it == e) {
+ // no match by name, try matching by type
+ name_to_close = "";
+ complain = true;
}
}
- else
- { // there is no subexpression
- int m = ini.findEndFromUp (path, i);
- if (-1 != m) // we have perfect match
- {
- path.resize(m - 1);
+
+ if (name_to_close.empty ()) {
+ // there was no name or we did not find the specified one
+ for (it = b; it != e; ++it) {
+ if ((*it)->getReadBy() == i)
+ break;
}
- else if ((i = path.size ()) > 0)
- {
- path.resize (i - 1);
+ if (it == e) {
+ // not even a match by type
+ it = b;
}
+
+ if (complain)
+ scanner_error ("Unexpected closing %s. Closing section %s.", found.c_str(), (*it)->getName());
}
+ open_sections.erase (b, ++it);
+ }
}
}
@@ -753,7 +762,7 @@
}
if (i != params.size ())
{
- if (!path.size())
+ if (open_sections.empty())
{ // we are in toplevel section, going deeper
// check for toplevel values allowance
if (!global_values)
@@ -763,7 +772,7 @@
}
else
{
- ini.findSection(path).initValue(key, val, comment, i);
+ open_sections.front()->initValue(key, val, comment, i);
}
comment = "";
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.14.4/agent-ini/testsuite/tests/repeat_opt.in new/yast2-core-2.15.1/agent-ini/testsuite/tests/repeat_opt.in
--- old/yast2-core-2.14.4/agent-ini/testsuite/tests/repeat_opt.in 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-core-2.15.1/agent-ini/testsuite/tests/repeat_opt.in 2006-12-06 16:02:45.000000000 +0100
@@ -0,0 +1,18 @@
+;
+; leading comment
+;
+[Section1]
+val1=1
+val2=2
+val1=3
+
+[Section2]
+val1=10
+val2=20
+
+[Section2]
+val2=40
+val3=30
+;
+; trailing comment
+;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.14.4/agent-ini/testsuite/tests/repeat_opt.out new/yast2-core-2.15.1/agent-ini/testsuite/tests/repeat_opt.out
--- old/yast2-core-2.14.4/agent-ini/testsuite/tests/repeat_opt.out 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-core-2.15.1/agent-ini/testsuite/tests/repeat_opt.out 2006-12-06 16:02:45.000000000 +0100
@@ -0,0 +1,19 @@
+(["Section1", "Section2", "Section2"])
+;
+; leading comment
+;
+[Section1]
+val1=1
+val2=2
+val1=3
+
+[Section2]
+val1=10
+val2=20
+
+[Section2]
+val2=40
+val3=30
+;
+; trailing comment
+;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.14.4/agent-ini/testsuite/tests/repeat_opt.scr new/yast2-core-2.15.1/agent-ini/testsuite/tests/repeat_opt.scr
--- old/yast2-core-2.14.4/agent-ini/testsuite/tests/repeat_opt.scr 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-core-2.15.1/agent-ini/testsuite/tests/repeat_opt.scr 2006-12-06 16:02:45.000000000 +0100
@@ -0,0 +1,20 @@
+.
+
+`ag_ini(
+ `IniAgent("tests/repeat_opt.in.test",
+ $[
+ "options" : [ "repeat_names" ],
+ "comments": [ "^[ \t]*;.*", ";.*", "^[ \t]*$" ],
+ "sections" : [
+ $[
+ "begin" : [ "[ \t]*\\[[ \t]*(.*[^ \t])[ \t]*\\][ \t]*", "[%s]" ],
+ ],
+ ],
+ "params" : [
+ $[
+ "match" : [ "^[ \t]*([^=]*[^ \t=])[ \t]*=[ \t]*(.*[^ \t]|)[ \t]*$" , "%s=%s"],
+ ],
+ ],
+ ]
+ )
+)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.14.4/agent-ini/testsuite/tests/repeat_opt.ycp new/yast2-core-2.15.1/agent-ini/testsuite/tests/repeat_opt.ycp
--- old/yast2-core-2.14.4/agent-ini/testsuite/tests/repeat_opt.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-core-2.15.1/agent-ini/testsuite/tests/repeat_opt.ycp 2006-12-06 16:02:45.000000000 +0100
@@ -0,0 +1,7 @@
+/*
+ * Preserve duplications. See also #224414.
+ */
+{
+ SCR::Write (., "force");
+ return SCR::Dir (.s);
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.14.4/config.h.in new/yast2-core-2.15.1/config.h.in
--- old/yast2-core-2.14.4/config.h.in 2006-10-31 17:00:51.000000000 +0100
+++ new/yast2-core-2.15.1/config.h.in 2006-12-06 16:57:35.000000000 +0100
@@ -65,7 +65,7 @@
/* If using the C implementation of alloca, define if you know the
direction of stack growth for your system; otherwise it will be
- automatically deduced at run-time.
+ automatically deduced at runtime.
STACK_DIRECTION > 0 => grows toward higher addresses
STACK_DIRECTION < 0 => grows toward lower addresses
STACK_DIRECTION = 0 => direction of growth unknown */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.14.4/configure.in new/yast2-core-2.15.1/configure.in
--- old/yast2-core-2.14.4/configure.in 2006-10-31 16:58:35.000000000 +0100
+++ new/yast2-core-2.15.1/configure.in 2006-12-06 16:57:22.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-core
dnl
-dnl -- This file is generated by y2autoconf 2.13.27 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-core, 2.14.4, http://bugs.opensuse.org/, yast2-core)
+AC_INIT(yast2-core, 2.15.1, http://bugs.opensuse.org/, yast2-core)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.14.4"
+VERSION="2.15.1"
RPMNAME="yast2-core"
MAINTAINER="Martin Vidner <mvidner(a)suse.cz>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.14.4/libycp/src/parser.h new/yast2-core-2.15.1/libycp/src/parser.h
--- old/yast2-core-2.14.4/libycp/src/parser.h 2006-09-19 17:01:02.000000000 +0200
+++ new/yast2-core-2.15.1/libycp/src/parser.h 2006-12-01 15:35:18.000000000 +0100
@@ -1,7 +1,9 @@
-/* A Bison parser, made by GNU Bison 2.1. */
+/* A Bison parser, made by GNU Bison 2.3. */
-/* Skeleton parser for Yacc-like parsing with Bison,
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+/* Skeleton interface for Bison's Yacc-like parsers in C
+
+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+ Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,10 +20,18 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA. */
-/* As a special exception, when this file is copied by Bison into a
- Bison output file, you may use that output file without restriction.
- This special exception was added by the Free Software Foundation
- in version 1.24 of Bison. */
+/* As a special exception, you may create a larger work that contains
+ part or all of the Bison parser skeleton and distribute that work
+ under terms of your choice, so long as that work isn't itself a
+ parser generator using the skeleton or a modified version thereof
+ as a parser skeleton. Alternatively, if you modify or redistribute
+ the parser skeleton itself, you may (at your option) remove this
+ special exception, which will cause the skeleton and the resulting
+ Bison output files to be licensed under the GNU General Public
+ License without this special exception.
+
+ This special exception was added by the Free Software Foundation in
+ version 2.2 of Bison. */
/* Tokens. */
#ifndef YYTOKENTYPE
@@ -164,7 +174,7 @@
-#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef int YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
@@ -173,5 +183,3 @@
-
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.14.4/libyui/src/YUI_bindings.cc new/yast2-core-2.15.1/libyui/src/YUI_bindings.cc
--- old/yast2-core-2.14.4/libyui/src/YUI_bindings.cc 2006-09-19 13:58:47.000000000 +0200
+++ new/yast2-core-2.15.1/libyui/src/YUI_bindings.cc 2006-12-06 16:55:52.000000000 +0100
@@ -101,6 +101,14 @@
return YCPVoid();
}
+static YCPValue
+UIRunInTerminal( const YCPString &module )
+{
+ if (YUIComponent::ui() )
+ return YUIComponent::ui()->evaluateRunInTerminal( module );
+ else
+ return YCPVoid();
+}
static YCPValue
UIGetLanguage( const YCPBoolean & strip )
@@ -649,6 +657,7 @@
{ "SetProductName", "void (string)", (void*) UISetProductName },
{ "SetConsoleFont", "void (string, string, string, string, string)", (void*) UISetConsoleFont },
{ "SetKeyboard", "void ()", (void*) UISetKeyboard },
+ { "RunInTerminal", "integer (string)", (void*) UIRunInTerminal },
{ "BusyCursor", "void ()", (void*) UIBusyCursor },
{ "NormalCursor", "void ()", (void*) UINormalCursor },
{ "RedrawScreen", "void ()", (void*) UIRedrawScreen },
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.14.4/libyui/src/YUI_builtins.cc new/yast2-core-2.15.1/libyui/src/YUI_builtins.cc
--- old/yast2-core-2.14.4/libyui/src/YUI_builtins.cc 2006-09-19 13:58:47.000000000 +0200
+++ new/yast2-core-2.15.1/libyui/src/YUI_builtins.cc 2006-12-06 16:57:16.000000000 +0100
@@ -230,6 +230,37 @@
/**
+ * @builtin RunInTerminal
+ * @short runs external program in the same terminal
+ * @description
+ * Use this builtin if you want to run external program from ncurses UI
+ * as a separate process. It saves current window layout to the stack and
+ * runs the external program in the same terminal. When done, it restores
+ * the original window layout and returns exit code of the external program
+ * (an integer value returned by system() call). When called from Qt UI,
+ * an error message is printed to the log.
+ * @param string external_program
+ * return integer
+ *
+ * @usage RunInTerminal("/bin/bash")
+ */
+
+YCPInteger YUI::evaluateRunInTerminal(const YCPString & module )
+{
+ int ret = runInTerminal( module );
+
+ return YCPInteger ( ret );
+
+}
+
+int YUI::runInTerminal ( const YCPString & module )
+{
+ y2error("Not in text-mode: Cannot run external program in terminal.");
+
+ return -1;
+}
+
+/**
* @builtin SetKeyboard
* @short Sets Keyboard
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.14.4/libyui/src/YUI_widgets.cc new/yast2-core-2.15.1/libyui/src/YUI_widgets.cc
--- old/yast2-core-2.14.4/libyui/src/YUI_widgets.cc 2006-09-19 13:58:43.000000000 +0200
+++ new/yast2-core-2.15.1/libyui/src/YUI_widgets.cc 2006-12-05 10:30:22.000000000 +0100
@@ -342,7 +342,7 @@
{
if ( term->size() != argnr+1 ||
term->value( argnr ).isNull() ||
- term->value( argnr )->isVoid() )
+ ! term->value( argnr )->isTerm() )
{
y2error( "Invalid arguments for the ReplacePoint widget: %s",
term->toString().c_str() );
@@ -889,7 +889,9 @@
int argnr, YRadioButtonGroup * rbg,
bool hsquash, bool vsquash )
{
- if ( term->size() != argnr+1 )
+ if ( term->size() != argnr+1 ||
+ term->value( argnr ).isNull() ||
+ ! term->value( argnr )->isTerm() )
{
y2error( "%s: The squash widgets take one widget as argument",
term->toString().c_str() );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.14.4/libyui/src/include/YUI.h new/yast2-core-2.15.1/libyui/src/include/YUI.h
--- old/yast2-core-2.14.4/libyui/src/include/YUI.h 2006-09-19 13:58:45.000000000 +0200
+++ new/yast2-core-2.15.1/libyui/src/include/YUI.h 2006-12-06 16:48:43.000000000 +0100
@@ -322,6 +322,7 @@
const YCPString& unicode_map,
const YCPString& encoding );
void evaluateSetKeyboard ();
+ YCPInteger evaluateRunInTerminal ( const YCPString& module);
YCPBoolean evaluateSetFocus ( const YCPValue & value_id );
void evaluateSetFunctionKeys ( const YCPMap & new_keys );
void evaluateSetLanguage ( const YCPString& lang, const YCPString& encoding = YCPNull() );
@@ -811,6 +812,15 @@
virtual YCPValue setKeyboard();
+
+ /**
+ * UI-specific runInTerminal() function.
+ * Returns (integer) return code of external program it spawns
+ * in the same terminal
+ */
+
+ virtual int runInTerminal( const YCPString & module );
+
/**
* UI-specific getDisplayInfo() functions.
* See UI builtin GetDisplayInfo() doc for details.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.14.4/libyui/src/include/YUISymbols.h new/yast2-core-2.15.1/libyui/src/include/YUISymbols.h
--- old/yast2-core-2.14.4/libyui/src/include/YUISymbols.h 2006-09-19 13:58:43.000000000 +0200
+++ new/yast2-core-2.15.1/libyui/src/include/YUISymbols.h 2006-12-04 16:30:55.000000000 +0100
@@ -51,6 +51,7 @@
#define YUIBuiltin_SetFocus "SetFocus"
#define YUIBuiltin_SetFunctionKeys "SetFunctionKeys"
#define YUIBuiltin_SetKeyboard "SetKeyboard"
+#define YUIBuiltin_RunInTerminal "RunInTerminal"
#define YUIBuiltin_SetLanguage "SetLanguage"
#define YUIBuiltin_SetModulename "SetModulename"
#define YUIBuiltin_SetProductName "SetProductName"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package yast2-bootloader
checked in at Thu Dec 7 21:41:01 CET 2006.
--------
--- yast2-bootloader/yast2-bootloader.changes 2006-12-01 11:34:51.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-bootloader/yast2-bootloader.changes 2006-12-01 16:59:14.000000000 +0100
@@ -1,0 +2,8 @@
+Fri Dec 1 16:58:24 CET 2006 - od(a)suse.de
+
+- use kernel and initrd softlinks in Failsafe entry again, thus
+ preventing the removal of the Failsafe entry when the kernel is
+ updated (#224481)
+- 2.14.15
+
+-------------------------------------------------------------------
Old:
----
yast2-bootloader-2.14.14.tar.bz2
New:
----
yast2-bootloader-2.14.15.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.ngk5Nl/_old 2006-12-07 21:40:06.000000000 +0100
+++ /var/tmp/diff_new_pack.ngk5Nl/_new 2006-12-07 21:40:06.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-bootloader (Version 2.14.14)
+# spec file for package yast2-bootloader (Version 2.14.15)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-bootloader
-Version: 2.14.14
+Version: 2.14.15
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-bootloader-2.14.14.tar.bz2
+Source0: yast2-bootloader-2.14.15.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxslt limal-bootloader limal-devel perl-XML-Writer perl-gettext sgml-skel swig update-alternatives update-desktop-files yast2-devel yast2-devtools yast2-installation yast2-perl-bindings yast2-testsuite
PreReq: /bin/sed %fillup_prereq
@@ -60,7 +60,7 @@
Dan Meszaros
%prep
-%setup -n yast2-bootloader-2.14.14
+%setup -n yast2-bootloader-2.14.15
%build
%{prefix}/bin/y2tool y2autoconf
@@ -112,6 +112,11 @@
/usr/share/YaST2/clients/bootfloppy.ycp
%changelog -n yast2-bootloader
+* Fri Dec 01 2006 - od(a)suse.de
+- use kernel and initrd softlinks in Failsafe entry again, thus
+ preventing the removal of the Failsafe entry when the kernel is
+ updated (#224481)
+- 2.14.15
* Fri Dec 01 2006 - jplack(a)suse.de
- signal change of boot loader location so that the boot loader can
be rewritten if needed (#225023)
++++++ yast2-bootloader-2.14.14.tar.bz2 -> yast2-bootloader-2.14.15.tar.bz2 ++++++
++++ 14801 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.14.14/Makefile.am new/yast2-bootloader-2.14.15/Makefile.am
--- old/yast2-bootloader-2.14.14/Makefile.am 2006-04-03 21:41:46.000000000 +0200
+++ new/yast2-bootloader-2.14.15/Makefile.am 2006-10-16 20:54:55.000000000 +0200
@@ -8,6 +8,7 @@
#where devtools are
PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
+Y2TOOL = $(PREFIX)/bin/y2tool
VERSION = $(shell cat $(srcdir)/VERSION)
RPMNAME = $(shell cat $(srcdir)/RPMNAME)
@@ -66,7 +67,7 @@
# because the prerequisite is made here (not anymore!)
# and we don't want any paths in y2autoconf
# info '(autoconf)config.status Invocation'
-$(RPMNAME).pc: $(RPMNAME).pc.in
+$(RPMNAME).pc: $(RPMNAME).pc.in config.status
./config.status --file=$@:$<
if CREATE_PKGCONFIG_NOARCH
@@ -95,7 +96,7 @@
done
pot:
- y2tool y2makepot -s $(srcdir)
+ $(Y2TOOL) y2makepot -s $(srcdir)
install-pot: pot
@POT_DST=`find -type d -name testsuite -prune , \
@@ -116,7 +117,7 @@
fi
spellcheck: pot
- y2tool pot-spellcheck
+ $(Y2TOOL) pot-spellcheck
# all-local: $(if $(IS_DEVTOOLS),,$(POT_DST))
@@ -143,20 +144,20 @@
rm -f package/*.bak
rm -f package/*.auto
mv $(RPMNAME)-$(VERSION).tar.bz2 package/
- if ! test -x $(PREFIX)/bin/y2tool; then \
- echo "$(PREFIX)/bin/y2tool: not found."; \
+ if ! test -x $(Y2TOOL); then \
+ echo "$(Y2TOOL): not found."; \
echo "You have to install yast2-devtools to making a package"; \
false; \
fi
here=`pwd`; \
cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \
newname="`echo "$$i" | sed "s/\.in$$//g"`"; \
- $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
+ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
done
package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
-TAGVERSION = $(PREFIX)/bin/y2tool tagversion
+TAGVERSION = $(Y2TOOL) tagversion
check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
if [ -d $(srcdir)/CVS ]; then \
@@ -200,12 +201,12 @@
fi
check-textdomain:
- $(PREFIX)/bin/y2tool check-textdomain $(srcdir)
+ $(Y2TOOL) check-textdomain $(srcdir)
stable: checkin-stable
checkin-stable: package
- $(PREFIX)/bin/y2tool checkin-stable
+ $(Y2TOOL) checkin-stable
# For po/ modules
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.14.14/Makefile.am.common new/yast2-bootloader-2.14.15/Makefile.am.common
--- old/yast2-bootloader-2.14.14/Makefile.am.common 2006-04-03 21:41:46.000000000 +0200
+++ new/yast2-bootloader-2.14.15/Makefile.am.common 2006-10-16 20:54:54.000000000 +0200
@@ -29,7 +29,19 @@
dist-hook: check-syntax
+CHECK_SYNTAX = true
check-syntax: $(client_DATA) $(ycpchook)
- if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi
+ @if test "$(client_DATA)"; then \
+ if $(CHECK_SYNTAX); then \
+ TO_CHECK="$(filter %.ycp,$^)"; \
+ echo "Checking syntax of $${TO_CHECK}"; \
+ if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \
+ echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \
+ exit 1; \
+ fi; \
+ else \
+ echo "Syntax check disabled"; \
+ fi; \
+ fi
-include .dep
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.14.14/VERSION new/yast2-bootloader-2.14.15/VERSION
--- old/yast2-bootloader-2.14.14/VERSION 2006-12-01 11:34:58.000000000 +0100
+++ new/yast2-bootloader-2.14.15/VERSION 2006-12-01 16:58:15.000000000 +0100
@@ -1 +1 @@
-2.14.14
+2.14.15
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.14.14/autodocs-ycp.ami new/yast2-bootloader-2.14.15/autodocs-ycp.ami
--- old/yast2-bootloader-2.14.14/autodocs-ycp.ami 2006-04-03 21:41:46.000000000 +0200
+++ new/yast2-bootloader-2.14.15/autodocs-ycp.ami 2006-10-16 20:54:55.000000000 +0200
@@ -1,18 +1,27 @@
# -*- makefile -*- Automake include file
-# $Id: autodocs-ycp.ami 23438 2005-05-17 16:31:21Z mvidner $
+# $Id: autodocs-ycp.ami 32798 2006-09-11 11:25:01Z mvidner $
# Builds source documentation for YCP sources
# Uses ycpdoc
# PARAMETERS:
# AUTODOCS_YCP: Files that the ycp autodocs is built from
# Optional - the default is $(srcdir)/../../src/*.ycp
+# AUTODOCS_PM: Files that the perl autodocs is built from
+# Optional - the default is $(srcdir)/../../src/*.pm
htmldir = $(docdir)/autodocs
html_DATA = index.html $(wildcard *.html)
-CLEANFILES = $(html_DATA)
+CLEANFILES = $(html_DATA) pod2htm*.tmp
-AUTODOCS_YCP ?= $(srcdir)/../../src/*.ycp
-index.html: $(AUTODOCS_YCP)
- ${YCPDOC} -d. $^
+AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp)
+AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm)
+index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM)
+#including *.pm, for the index
+ ${YCPDOC} -d. $^
+ for i in $(AUTODOCS_PM); do \
+ b=`basename $$i`; b=$${b%.pm}; \
+ pod2html --title=$$b --infile=$$i --outfile=$$b.html; \
+ echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \
+ done
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.14.14/config.h.in new/yast2-bootloader-2.14.15/config.h.in
--- old/yast2-bootloader-2.14.14/config.h.in 2006-04-03 21:42:06.000000000 +0200
+++ new/yast2-bootloader-2.14.15/config.h.in 2006-10-16 20:55:20.000000000 +0200
@@ -65,7 +65,7 @@
/* If using the C implementation of alloca, define if you know the
direction of stack growth for your system; otherwise it will be
- automatically deduced at run-time.
+ automatically deduced at runtime.
STACK_DIRECTION > 0 => grows toward higher addresses
STACK_DIRECTION < 0 => grows toward lower addresses
STACK_DIRECTION = 0 => direction of growth unknown */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.14.14/configure.in new/yast2-bootloader-2.14.15/configure.in
--- old/yast2-bootloader-2.14.14/configure.in 2006-04-03 21:41:46.000000000 +0200
+++ new/yast2-bootloader-2.14.15/configure.in 2006-10-16 20:54:54.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-bootloader
dnl
-dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.27 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-bootloader, 2.13.36, http://www.suse.de/feedback, yast2-bootloader)
+AC_INIT(yast2-bootloader, 2.13.79, http://bugs.opensuse.org/, yast2-bootloader)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.36"
+VERSION="2.13.79"
RPMNAME="yast2-bootloader"
MAINTAINER="Olaf Dabrunz <od(a)suse.de>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.14.14/src/modules/Bootloader.ycp new/yast2-bootloader-2.14.15/src/modules/Bootloader.ycp
--- old/yast2-bootloader-2.14.14/src/modules/Bootloader.ycp 2006-11-22 10:17:46.000000000 +0100
+++ new/yast2-bootloader-2.14.15/src/modules/Bootloader.ycp 2006-12-01 16:58:07.000000000 +0100
@@ -11,7 +11,7 @@
* Authors:
* Jiri Srain <jsrain(a)suse.cz>
*
- * $Id: Bootloader.ycp 34538 2006-11-21 13:55:48Z odabrunz $
+ * $Id: Bootloader.ycp 34700 2006-12-01 15:58:04Z odabrunz $
*
*/
@@ -603,9 +603,9 @@
// change only linux, failsafe and xen sections
BootCommon::sections = maplist (map<string,any> s, BootCommon::sections, {
// skip sections that are not linux, xen or failsafe
- if ( !contains ( ["linux", "xen", "failsafe"] , s["original_name"]:"") ||
+ if ( !contains ( ["linux", "xen"] , s["original_name"]:"") ||
!contains ( ["image", "xen"] , s["type"]:"") ) {
- y2milestone("section %1: not linux, xen or failsafe, skipping kernel and initrd remapping",
+ y2milestone("section %1: not linux or xen, skipping kernel and initrd remapping",
s["name"]:"");
return s;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package yast2
checked in at Thu Dec 7 21:40:31 CET 2006.
--------
--- yast2/yast2.changes 2006-11-28 09:42:35.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2006-12-06 16:31:35.000000000 +0100
@@ -1,0 +2,9 @@
+Tue Dec 5 11:20:10 CET 2006 - kmachalkova(a)suse.cz
+
+- Adapt ncurses menu.ycp for running yast modules as separate
+ processes (#148683, #221254, #222547)
+- Do not change LANG and LC_CTYPE when stdin does not support
+ utf8 (testutf8 returns 0) (partly #179989)
+- 2.15.0
+
+-------------------------------------------------------------------
Old:
----
yast2-2.14.15.tar.bz2
New:
----
yast2-2.15.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.MCXKuL/_old 2006-12-07 21:39:59.000000000 +0100
+++ /var/tmp/diff_new_pack.MCXKuL/_new 2006-12-07 21:39:59.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2 (Version 2.14.15)
+# spec file for package yast2 (Version 2.15.0)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,16 +11,16 @@
# norootforbuild
Name: yast2
-Version: 2.14.15
+Version: 2.15.0
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-2.14.15.tar.bz2
+Source0: yast2-2.15.0.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-pkg-bindings yast2-testsuite
-# Need the new file popups
-Requires: yast2-core >= 2.7.1
+# UI::RunInTerminal builtin
+Requires: yast2-core >= 2.15.1
# Script callbacks
Requires: yast2-pkg-bindings >= 2.13.99
Requires: yast2_ui yast2_theme
@@ -97,7 +97,7 @@
Steffen Winterfeldt <snwint(a)suse.de>
%prep
-%setup -n yast2-2.14.15
+%setup -n yast2-2.15.0
%build
%{prefix}/bin/y2tool y2autoconf
@@ -197,6 +197,12 @@
%doc %{prefix}/share/doc/packages/yast2/wizard
%changelog -n yast2
+* Tue Dec 05 2006 - kmachalkova(a)suse.cz
+- Adapt ncurses menu.ycp for running yast modules as separate
+ processes (#148683, #221254, #222547)
+- Do not change LANG and LC_CTYPE when stdin does not support
+ utf8 (testutf8 returns 0) (partly #179989)
+- 2.15.0
* Tue Nov 28 2006 - jsrain(a)suse.cz
- fixed board detection on PPC (#223872)
- 2.14.15
++++++ yast2-2.14.15.tar.bz2 -> yast2-2.15.0.tar.bz2 ++++++
++++ 2539 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.14.15/VERSION new/yast2-2.15.0/VERSION
--- old/yast2-2.14.15/VERSION 2006-11-28 09:40:18.000000000 +0100
+++ new/yast2-2.15.0/VERSION 2006-12-05 11:19:58.000000000 +0100
@@ -1 +1 @@
-2.14.15
+2.15.0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.14.15/configure.in new/yast2-2.15.0/configure.in
--- old/yast2-2.14.15/configure.in 2006-11-28 09:40:45.000000000 +0100
+++ new/yast2-2.15.0/configure.in 2006-12-06 16:00:49.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2
dnl
-dnl -- This file is generated by y2autoconf 2.13.29 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2, 2.14.15, http://bugs.opensuse.org/, yast2)
+AC_INIT(yast2, 2.15.0, http://bugs.opensuse.org/, yast2)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.14.15"
+VERSION="2.15.0"
RPMNAME="yast2"
MAINTAINER="Jiri Srain <jsrain(a)suse.cz>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.14.15/library/desktop/src/menu.ycp new/yast2-2.15.0/library/desktop/src/menu.ycp
--- old/yast2-2.14.15/library/desktop/src/menu.ycp 2006-05-03 11:03:53.000000000 +0200
+++ new/yast2-2.15.0/library/desktop/src/menu.ycp 2006-12-06 16:26:40.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: NCurses Control Center
* Authors: Michal Svec <msvec(a)suse.cz>
*
- * $Id: menu.ycp 30245 2006-04-19 13:11:14Z jsuchome $
+ * $Id: menu.ycp 34812 2006-12-06 15:26:38Z kmachalkova $
*
* Provides a list of available yast2 modules. This module is inteded for use
* with ncurses, for X the yast2 control center should be used.
@@ -84,13 +84,15 @@
*/
define boolean Launch(string modul) {
string function = Modules[modul, "X-SuSE-YaST-Call"]:"";
- list arguments = splitstring(Modules[modul, "X-SuSE-YaST-Argument"]:"", " ");
- y2debug("Calling: %1 (%2)", function, arguments);
+ string argument = Modules[modul, "X-SuSE-YaST-Argument"]:"";
+ y2debug("Calling: %1 (%2)", function, argument);
if(function != "") {
- any ret = WFM::CallFunction (function, arguments);
- y2debug("WFM::CallFunction (%1, %2) returns: %3", function, arguments, ret);
+ string cmd = sformat ("/sbin/yast %1 %2 >&2", function, argument);
+ any ret = UI::RunInTerminal(cmd);
+ y2milestone ("Got %1 from %2", ret, cmd);
+
if ((function == "online_update" && ret == -42) || ret == `restart_menu)
{
y2milestone ("yast needs to be restarted - exiting...");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.14.15/library/modules/Version.ycp new/yast2-2.15.0/library/modules/Version.ycp
--- old/yast2-2.14.15/library/modules/Version.ycp 2006-11-28 09:41:22.000000000 +0100
+++ new/yast2-2.15.0/library/modules/Version.ycp 2006-12-06 16:01:08.000000000 +0100
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.14.15";
+global string yast2 = "2.15.0";
/* EOF */
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.14.15/scripts/yast2 new/yast2-2.15.0/scripts/yast2
--- old/yast2-2.14.15/scripts/yast2 2006-11-28 09:14:40.000000000 +0100
+++ new/yast2-2.15.0/scripts/yast2 2006-12-06 15:56:01.000000000 +0100
@@ -166,7 +166,7 @@
export LC_CTYPE=${LANG%%[.(a)]*}.UTF-8
;;
esac
- if /bin/testutf8 ; [ $? -ne 2 ] ; then
+ if /bin/testutf8 ; [ $? -eq 1 ] ; then
/usr/bin/test -x /bin/unicode_start && /bin/unicode_start
uc_started=1
fi
@@ -177,18 +177,23 @@
UTF8TESTED=0
# binary /bin/testutf8 is missing at least on s390x, #158001
/usr/bin/test -x /bin/testutf8 && UTF8TESTED=1 && /bin/testutf8
- # return code of the /bin/testutf8
- # 0=utf-unknown, 1=utf-ok, 2=utf-err
+ # return code of the /bin/testutf8 (more info in bug #179989)
+ # 0=stdin does not support utf8, 1=not utf8, 2=utf8
+
UTF8STATUS=$?
- # not tested or not working UTF-8 support
- if [ "$UTF8TESTED" == "1" ] && [ $UTF8STATUS -ne 2 ] ; then
+ # the terminal supports utf8, but it's not currently set
+ # so strip .UTF-8 suffix from locale
+ if [ "$UTF8TESTED" == "1" ] && [ $UTF8STATUS -eq 1 ] ; then
/usr/bin/test -n "$LANG" && LANG=${LANG%.UTF-8}
/usr/bin/test -n "$LC_CTYPE" && LC_CTYPE=${LC_CTYPE%.UTF-8}
- else
+ # the terminal supports utf8 and it is currently set
+ # so strip any possible suffix from locale and append .UTF-8
+ elif [ "$UTF8TESTED" == "1" ] && [ $UTF8STATUS -eq 2 ]; then
/usr/bin/test -n "$LANG" && LANG=${LANG%%[.(a)]*}.UTF-8
/usr/bin/test -n "$LC_CTYPE" && LC_CTYPE=${LC_CTYPE%%[.(a)]*}.UTF-8
fi
+ #default: do nothing, keep locale untouched
;;
esac
fi
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package xterm
checked in at Thu Dec 7 21:39:56 CET 2006.
--------
--- xterm/xterm.changes 2006-11-28 06:06:47.000000000 +0100
+++ /mounts/work_src_done/STABLE/xterm/xterm.changes 2006-12-01 06:30:18.000000000 +0100
@@ -1,0 +2,41 @@
+Fri Dec 1 06:21:09 CET 2006 - sndirsch(a)suse.de
+
+- updated to xterm-223 (2006/11/30)
+ * add --enable-rectangles configure option (request by Martin
+ Pirker).
+ * correct default value for --with-symlink configure option.
+ * fixes configure script macros that use $X_EXTRA_LIBS.
+ * modify configure script to provide support for pre-package config
+ versions of Xft (FreeType).
+ * add the Xaw scrollbar translations resource to the xterm manpage,
+ add an example showing how to change the mouse button assignments
+ (Debian #382225).
+ * amend a change from [227]patch #216, which omitted modifiers for
+ control, meta, etc., if they were mixed with any other modifiers.
+ The intent of the change was to avoid confusion with
+ XK_Mode_switch and XK_ISO_Level3_Shift; the check is now done
+ explicitly (report by Daniel Jacobowitz).
+ * interpret a negative value for modifyCursorKeys or
+ modifyFunctionKeys resources to disable the respective features
+ (prompted by Novell #220728).
+ * amend cell-width computation for FreeType from [228]patch #217,
+ which did not work for VT100 line-drawing characters (Debian
+ #399638, GenToo #147111).
+ * amend a change from [229]patch #216, which made alt-modifier on a
+ cursor-key send a modifier parameter (Novell #220728).
+ * correct an off-by-one that made DECCRA not work (report/patch by
+ Martin Pirker).
+ * revert an optimization in SGR_Foreground() and SGR_Background from
+ [230]patch #209 (Debian #347722, analysis by Pierre Lombard).
+ * fix for boldMode (Debian #347790, patch by Tim Pope).
+ * amend fix for -iconic in [231]patch #208, which broke the
+ positioning part of -geom with toolbar configuration.
+ * fix to prevent indexing error in regular expressions (patch by
+ Dennis Schneider).
+ * fixes to make the internalBorder area not change color due to
+ reverseVideo and/or related exposure events. The latter was a very
+ old bug exposed in [232]patch #196 (report by Neil Hoggarth, also
+ Debian #397624).
+- obsoletes bug220728.diff
+
+-------------------------------------------------------------------
Old:
----
bug220728.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xterm.spec ++++++
--- /var/tmp/diff_new_pack.54UN4e/_old 2006-12-07 21:39:44.000000000 +0100
+++ /var/tmp/diff_new_pack.54UN4e/_new 2006-12-07 21:39:44.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package xterm (Version 222)
+# spec file for package xterm (Version 223)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -17,8 +17,8 @@
Group: System/X11/Utilities
Provides: xorg-x11:/usr/X11R6/bin/xterm XFree86:/usr/X11R6/bin/xterm
Autoreqprov: on
-Version: 222
-Release: 12
+Version: 223
+Release: 1
Summary: The basic X terminal program
Source: %name.tar.gz
Source1: luitx
@@ -33,7 +33,6 @@
Patch: p_xterm-config.diff
Patch1: p_xterm-settings.diff
Patch2: p_xterm-sigwinch.diff
-Patch3: bug220728.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -155,7 +154,6 @@
%patch -p2 -b .xterm-config
%patch1 -p0 -b .xterm-settings
%patch2 -p0 -b .xterm-sigwinch
-%patch3
cp $RPM_SOURCE_DIR/*bdf.bz2 .
bunzip2 *.bdf.bz2
@@ -245,6 +243,44 @@
/usr/share/pixmaps/terminal.png
%changelog -n xterm
+* Fri Dec 01 2006 - sndirsch(a)suse.de
+- updated to xterm-223 (2006/11/30)
+ * add --enable-rectangles configure option (request by Martin
+ Pirker).
+ * correct default value for --with-symlink configure option.
+ * fixes configure script macros that use $X_EXTRA_LIBS.
+ * modify configure script to provide support for pre-package config
+ versions of Xft (FreeType).
+ * add the Xaw scrollbar translations resource to the xterm manpage,
+ add an example showing how to change the mouse button assignments
+ (Debian #382225).
+ * amend a change from [227]patch #216, which omitted modifiers for
+ control, meta, etc., if they were mixed with any other modifiers.
+ The intent of the change was to avoid confusion with
+ XK_Mode_switch and XK_ISO_Level3_Shift; the check is now done
+ explicitly (report by Daniel Jacobowitz).
+ * interpret a negative value for modifyCursorKeys or
+ modifyFunctionKeys resources to disable the respective features
+ (prompted by Novell #220728).
+ * amend cell-width computation for FreeType from [228]patch #217,
+ which did not work for VT100 line-drawing characters (Debian
+ [#399638], GenToo #147111).
+ * amend a change from [229]patch #216, which made alt-modifier on a
+ cursor-key send a modifier parameter (Novell #220728).
+ * correct an off-by-one that made DECCRA not work (report/patch by
+ Martin Pirker).
+ * revert an optimization in SGR_Foreground() and SGR_Background from
+ [230]patch #209 (Debian #347722, analysis by Pierre Lombard).
+ * fix for boldMode (Debian #347790, patch by Tim Pope).
+ * amend fix for -iconic in [231]patch #208, which broke the
+ positioning part of -geom with toolbar configuration.
+ * fix to prevent indexing error in regular expressions (patch by
+ Dennis Schneider).
+ * fixes to make the internalBorder area not change color due to
+ reverseVideo and/or related exposure events. The latter was a very
+ old bug exposed in [232]patch #196 (report by Neil Hoggarth, also
+ Debian #397624).
+- obsoletes bug220728.diff
* Tue Nov 28 2006 - sndirsch(a)suse.de
- bug220728.diff:
* Essentially the problem reported is that xterm #216 does a more
++++++ xterm.tar.gz ++++++
++++ 9748 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package xteddy
checked in at Thu Dec 7 21:39:47 CET 2006.
--------
--- xteddy/xteddy.changes 2006-06-16 14:26:02.000000000 +0200
+++ /mounts/work_src_done/STABLE/xteddy/xteddy.changes 2006-12-05 12:21:20.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Dec 5 12:19:22 CET 2006 - ma(a)suse.de
+
+- don't install below /usr/X11R6.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xteddy.spec ++++++
--- /var/tmp/diff_new_pack.d1fCoS/_old 2006-12-07 21:39:40.000000000 +0100
+++ /var/tmp/diff_new_pack.d1fCoS/_new 2006-12-07 21:39:40.000000000 +0100
@@ -12,13 +12,13 @@
Name: xteddy
BuildRequires: giflib-devel imlib-devel libpng-devel libtiff-devel xorg-x11 xorg-x11-devel
-License: GPL
+License: GNU General Public License (GPL)
Group: Amusements/Toys/Graphics
Provides: xteddy10
Autoreqprov: on
Summary: A cuddly teddy bear for your X Window desktop
Version: 2.0.1
-Release: 16
+Release: 40
Source: xteddy-2.0.1.tar.gz
Patch: xteddy-configure.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -49,7 +49,7 @@
%build
autoreconf --force --install
CFLAGS="$RPM_OPT_FLAGS `imlib-config --cflags`" \
-./configure --prefix=/usr/X11R6 --mandir=/usr/X11R6/man
+./configure --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir}
make
%install
@@ -63,11 +63,13 @@
%defattr(-,root,root)
%doc html/*.html
%doc html/images
- /usr/X11R6/bin/*
- /usr/X11R6/man/man1/*
- /usr/X11R6/share/xteddy
+ %{_bindir}/*
+ %{_mandir}/man1/*
+ %{_datadir}/%{name}
%changelog -n xteddy
+* Tue Dec 05 2006 - ma(a)suse.de
+- don't install below /usr/X11R6.
* Fri Jun 16 2006 - schwab(a)suse.de
- Set mandir.
- Use RPM_OPT_FLAGS.
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package xsane
checked in at Thu Dec 7 21:39:38 CET 2006.
--------
--- xsane/xsane.changes 2006-10-28 08:18:24.000000000 +0200
+++ /mounts/work_src_done/STABLE/xsane/xsane.changes 2006-12-07 15:33:18.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Dec 7 15:30:33 CET 2006 - jsmeix(a)suse.de
+
+- Changed /usr/X11R6/bin/xsane to /usr/bin/xsane
+ (see Suse bugzilla bug #224882).
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xsane.spec ++++++
--- /var/tmp/diff_new_pack.lSuiie/_old 2006-12-07 21:38:13.000000000 +0100
+++ /var/tmp/diff_new_pack.lSuiie/_new 2006-12-07 21:38:13.000000000 +0100
@@ -12,13 +12,13 @@
Name: xsane
BuildRequires: gimp-devel libgphoto2-devel libtiff-devel sane update-desktop-files
-License: GNU General Public License (GPL) - all versions
+License: GNU General Public License (GPL)
Group: Hardware/Scanner
Requires: sane
Autoreqprov: on
Summary: A GTK-Based Graphical Scanning Front-End for SANE
Version: 0.991
-Release: 20
+Release: 32
URL: http://www.xsane.org/
# URL for Source0: http://www.xsane.org/download/xsane-0.991.tar.gz
Source0: xsane-%{version}.tar.bz2
@@ -62,7 +62,7 @@
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
# See /usr/lib/rpm/suse_macros regarding our RPM macros (e.g. sysconfdir is /etc):
./configure --prefix=%{_prefix} \
- --exec-prefix=%{_prefix}/X11R6 \
+ --exec-prefix=%{_prefix} \
--sysconfdir=%{_sysconfdir} \
--mandir=%{_mandir} \
--enable-gimp
@@ -70,14 +70,14 @@
%install
rm -rf $RPM_BUILD_ROOT
-make exec_prefix=$RPM_BUILD_ROOT%{_prefix}/X11R6 \
+make prefix=$RPM_BUILD_ROOT%{_prefix} \
+ exec_prefix=$RPM_BUILD_ROOT%{_prefix} \
sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir} \
mandir=$RPM_BUILD_ROOT%{_mandir} \
- prefix=$RPM_BUILD_ROOT%{_prefix} \
install
# Create GIMP plugin link:
mkdir -p $RPM_BUILD_ROOT/opt/gnome/%{_lib}/gimp/2.0/plug-ins
-ln -sf %{_prefix}/X11R6/bin/xsane $RPM_BUILD_ROOT/opt/gnome/%{_lib}/gimp/2.0/plug-ins/xsane
+ln -sf %{_bindir}/xsane $RPM_BUILD_ROOT/opt/gnome/%{_lib}/gimp/2.0/plug-ins/xsane
# Desktop menue entry stuff:
install -d -m755 $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/scanner_32x32.png
@@ -89,7 +89,7 @@
%files
%defattr(-,root,root)
%doc xsane*
-%{_prefix}/X11R6/bin/xsane
+%{_bindir}/xsane
%{_datadir}/sane/xsane/
%{_datadir}/locale/*/LC_MESSAGES/xsane.mo
%{_mandir}/man1/xsane.1.gz
@@ -98,6 +98,9 @@
%{_datadir}/pixmaps/scanner_32x32.png
%changelog -n xsane
+* Thu Dec 07 2006 - jsmeix(a)suse.de
+- Changed /usr/X11R6/bin/xsane to /usr/bin/xsane
+ (see Suse bugzilla bug #224882).
* Sat Oct 28 2006 - meissner(a)suse.de
- buildrequires: libgphoto2-devel
* Tue Sep 05 2006 - aj(a)suse.de
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package xplanet
checked in at Thu Dec 7 21:39:36 CET 2006.
--------
--- xplanet/xplanet.changes 2006-01-25 21:43:22.000000000 +0100
+++ /mounts/work_src_done/STABLE/xplanet/xplanet.changes 2006-12-07 16:47:00.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Dec 7 16:46:16 CET 2006 - jsmeix(a)suse.de
+
+- Changed /usr/X11R6/bin/ to /usr/bin/
+ (see Suse bugzilla bug #224882).
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xplanet.spec ++++++
--- /var/tmp/diff_new_pack.aOprv7/_old 2006-12-07 21:37:52.000000000 +0100
+++ /var/tmp/diff_new_pack.aOprv7/_new 2006-12-07 21:37:52.000000000 +0100
@@ -1,11 +1,11 @@
#
# spec file for package xplanet (Version 1.2.0)
#
-# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
-# Please submit bugfixes or comments via http://www.suse.de/feedback/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
@@ -14,9 +14,9 @@
BuildRequires: freetype2-devel gcc-c++ giflib-devel libpng-devel libtiff-devel netpbm xorg-x11-devel
URL: http://xplanet.sourceforge.net/
Version: 1.2.0
-Release: 1
+Release: 34
Summary: Planets as Background Pictures or Interactive Animations
-License: GPL
+License: GNU General Public License (GPL)
Group: Productivity/Scientific/Astronomy
Autoreqprov: on
Source: %name-%version.tar.bz2
@@ -43,7 +43,7 @@
%build
./configure --prefix=%_prefix \
- --exec-prefix=/usr/X11R6 \
+ --exec-prefix=%_prefix \
--mandir=%_mandir \
--enable-screensaver \
--libdir=%_libdir
@@ -55,14 +55,17 @@
%files
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog NEWS READM* TODO
-/usr/X11R6/bin/*
-%_mandir/man1/%name.1.gz
-/usr/share/%name
+%_bindir/%name
+%doc %_mandir/man1/%name.1.gz
+%_datadir/%name
%clean
rm -rf $RPM_BUILD_ROOT
%changelog -n xplanet
+* Thu Dec 07 2006 - jsmeix(a)suse.de
+- Changed /usr/X11R6/bin/ to /usr/bin/
+ (see Suse bugzilla bug #224882).
* Wed Jan 25 2006 - mls(a)suse.de
- converted neededforbuild to BuildRequires
* Wed Jun 22 2005 - mmj(a)suse.de
@@ -200,7 +203,7 @@
- use mesa-devel-packages in neededforbuild
* Fri Aug 24 2001 - poeml(a)suse.de
- update to 0.84, new features: -fontsize and -prev_command/
--post_command options, and saturn rings :)
+ -post_command options, and saturn rings :)
* Wed Apr 04 2001 - poeml(a)suse.de
- update to 0.81
- drop Requires on xglobe-maps (now, two nice images come with
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0