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@suse.cz
+
+- #226408 - Network card -> IPv6 configuration: cannot go back
+- 2.15.1
+
+-------------------------------------------------------------------
+Wed Dec 6 15:08:38 CET 2006 - mzugec@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
%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@suse.cz
+- #226408 - Network card -> IPv6 configuration: cannot go back
+- 2.15.1
+* Wed Dec 06 2006 - mzugec@suse.cz
+- #224884 - avoid some unwished error message (brctl)
+- 2.15.0
* Wed Nov 29 2006 - kmachalkova@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 "
@@ -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
*
- * $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
*
- * $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
*
- * $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@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org