Hello community,
here is the log from the commit of package yast2-network
checked in at Thu Oct 12 15:09:18 CEST 2006.
--------
--- yast2-network/yast2-network.changes 2006-09-25 15:27:24.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2006-10-12 11:00:09.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Oct 12 10:59:39 CEST 2006 - mvidner@suse.cz
+
+- Disabled conflicting definitions in host.rnc from last change.
+- 2.13.67
+
+-------------------------------------------------------------------
Old:
----
yast2-network-2.13.66.tar.bz2
New:
----
yast2-network-2.13.67.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.6OPMWO/_old 2006-10-12 15:08:51.000000000 +0200
+++ /var/tmp/diff_new_pack.6OPMWO/_new 2006-10-12 15:08:51.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-network (Version 2.13.66)
+# spec file for package yast2-network (Version 2.13.67)
#
# 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.13.66
+Version: 2.13.67
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.13.66.tar.bz2
+Source0: yast2-network-2.13.67.tar.bz2
prefix: /usr
# should be required by devtools
BuildRequires: perl-XML-Writer pkgconfig
@@ -50,7 +50,7 @@
Michal Svec
%prep
-%setup -n yast2-network-2.13.66
+%setup -n yast2-network-2.13.67
%build
%{prefix}/bin/y2tool y2autoconf
@@ -105,6 +105,9 @@
/usr/share/YaST2/schema/autoyast/rnc/host.rnc
%changelog -n yast2-network
+* Thu Oct 12 2006 - mvidner@suse.cz
+- Disabled conflicting definitions in host.rnc from last change.
+- 2.13.67
* Mon Sep 25 2006 - kmachalkova@suse.cz
- Better autoyast XML validation for networking and host
- Conversion function in Host::Import to handle older profiles
++++++ yast2-network-2.13.66.tar.bz2 -> yast2-network-2.13.67.tar.bz2 ++++++
++++ 13389 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.13.66/Makefile.am new/yast2-network-2.13.67/Makefile.am
--- old/yast2-network-2.13.66/Makefile.am 2006-09-25 13:22:22.000000000 +0200
+++ new/yast2-network-2.13.67/Makefile.am 2006-10-12 11:10:46.000000000 +0200
@@ -67,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
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.13.66/Makefile.am.common new/yast2-network-2.13.67/Makefile.am.common
--- old/yast2-network-2.13.66/Makefile.am.common 2006-09-25 13:22:22.000000000 +0200
+++ new/yast2-network-2.13.67/Makefile.am.common 2006-10-12 11:10:46.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-network-2.13.66/VERSION new/yast2-network-2.13.67/VERSION
--- old/yast2-network-2.13.66/VERSION 2006-09-25 15:16:06.000000000 +0200
+++ new/yast2-network-2.13.67/VERSION 2006-10-12 10:58:46.000000000 +0200
@@ -1 +1 @@
-2.13.66
+2.13.67
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.13.66/configure.in new/yast2-network-2.13.67/configure.in
--- old/yast2-network-2.13.66/configure.in 2006-09-25 13:22:21.000000000 +0200
+++ new/yast2-network-2.13.67/configure.in 2006-10-12 11:10:41.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-network
dnl
-dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.26 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-network, 2.13.65, http://bugs.opensuse.org/, yast2-network)
+AC_INIT(yast2-network, 2.13.67, 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.13.65"
+VERSION="2.13.67"
RPMNAME="yast2-network"
MAINTAINER="Michal Zugec "
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.13.66/src/clients/lan.ycp new/yast2-network-2.13.67/src/clients/lan.ycp
--- old/yast2-network-2.13.66/src/clients/lan.ycp 2006-08-11 09:23:30.000000000 +0200
+++ new/yast2-network-2.13.67/src/clients/lan.ycp 2006-10-12 10:49:58.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Network cards main file
* Authors: Michal Svec
*
- * $Id: lan.ycp 27593 2006-02-05 16:39:17Z mvidner $
+ * $Id: lan.ycp 33322 2006-10-10 17:31:47Z mzugec $
*
* Main file for network card configuration.
* Uses all other files.
@@ -49,6 +49,12 @@
"example" : "lan list configured",
"handler" : ListHandler,
],
+ "show" : $[
+ /* Commandline command help */
+ "help" : _("Display configuration summary"),
+ "example" : "lan show id=...",
+ "handler" : ShowHandler,
+ ],
"add" : $[
/* Commandline command help */
"help" : _("Add a network card"),
@@ -81,12 +87,28 @@
"type" : "string",
"example" : "lan add device=eth0"
],
+ "id" : $[
+ /* Commandline option help */
+ "help" : _("Config identifier"),
+ "type" : "string",
+ "example" : "lan show id=0"
+ ],
+ "bootproto" : $[
+ "help" : _("Use static or dynamic configuration"),
+ "type" : "string",
+ "example" : "add type=ethernet bootproto=dhcp"
+ ],
+ "type" : $[
+ "help" : _("Device type"),
+ "type" : "string",
+ "example" : "add type=bluetooth"
+ ],
"bootproto" : $[
/* Commandline option help */
"help": _("Device boot protocol"),
"type": "string"
],
- "ipaddr" : $[
+ "ip" : $[
/* Commandline option help */
"help": _("Device IP address"),
"type": "ip"
@@ -99,8 +121,9 @@
],
"mappings" : $[
"list" : [ "configured", "unconfigured" ],
- "add" : [ "device", "bootproto", "ipaddr", "netmask" ],
- "delete": [ "device" ],
+ "show" : [ "id" ],
+ "add" : [ "type", "bootproto", "ip", "netmask" ],
+ "delete": [ "id" ],
]
];
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.13.66/src/config/host.rnc new/yast2-network-2.13.67/src/config/host.rnc
--- old/yast2-network-2.13.66/src/config/host.rnc 2006-09-22 16:04:08.000000000 +0200
+++ new/yast2-network-2.13.67/src/config/host.rnc 2006-10-12 10:54:35.000000000 +0200
@@ -1,9 +1,11 @@
default namespace = "http://www.suse.com/1.0/yast2ns"
namespace config = "http://www.suse.com/1.0/configns"
namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
-include "common.rnc"
-# to be overriden if included
-start = element profile { host }
+# These currently conflict with the including files
+# which would need adjustments
+#include "common.rnc"
+## to be overriden if included
+#start = element profile { host }
host =
element host {
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.13.66/src/lan/address.ycp new/yast2-network-2.13.67/src/lan/address.ycp
--- old/yast2-network-2.13.66/src/lan/address.ycp 2006-09-01 09:30:44.000000000 +0200
+++ new/yast2-network-2.13.67/src/lan/address.ycp 2006-10-12 10:49:59.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Network card adresss configuration dialogs
* Authors: Michal Svec
*
- * $Id: address.ycp 32628 2006-08-30 11:37:04Z mzugec $
+ * $Id: address.ycp 33322 2006-10-10 17:31:47Z mzugec $
*/
{
@@ -642,6 +642,7 @@
* @return dialog result
*/
define any AddressDialog() {
+y2internal("AddressDialog");
ScreenName("lan-address");
string ifname = NetworkDevices::device_name (Lan::type, Lan::device);
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.13.66/src/lan/cmdline.ycp new/yast2-network-2.13.67/src/lan/cmdline.ycp
--- old/yast2-network-2.13.66/src/lan/cmdline.ycp 2006-08-11 09:23:40.000000000 +0200
+++ new/yast2-network-2.13.67/src/lan/cmdline.ycp 2006-10-12 10:49:59.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Network cards cmdline handlers
* Authors: Michal Svec
*
- * $Id: cmdline.ycp 21544 2005-02-11 16:24:46Z mvidner $
+ * $Id: cmdline.ycp 33322 2006-10-10 17:31:47Z mzugec $
*/
{
@@ -16,45 +16,110 @@
import "Lan";
import "NetworkDevices";
import "RichText";
+import "Report";
+
+list