commit yast2-network

24 Sep 2007

Hello community,

here is the log from the commit of package yast2-network
checked in at Mon Sep 24 19:01:38 CEST 2007.

--------

--- yast2-network/yast2-network.changes	2007-09-21 16:22:19.000000000 +0200
+++ /mounts/work_src_done/STABLE/STABLE/yast2-network/yast2-network.changes	2007-09-24 11:03:13.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Sep 24 11:01:05 CEST 2007 - mzugec@suse.cz
+
+- for update system don't copy network from inst_sys (#325738)
+- 2.15.80 
+
+-------------------------------------------------------------------

Old:
----
  yast2-network-2.15.79.tar.bz2

New:
----
  yast2-network-2.15.80.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.vN6456/_old	2007-09-24 19:01:24.000000000 +0200
+++ /var/tmp/diff_new_pack.vN6456/_new	2007-09-24 19:01:24.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-network (Version 2.15.79)
+# spec file for package yast2-network (Version 2.15.80)
 #
 # Copyright (c) 2007 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.15.79
-Release:        2
+Version:        2.15.80
+Release:        1
 License:        GPL v2 or later
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-network-2.15.79.tar.bz2
+Source0:        yast2-network-2.15.80.tar.bz2
 Prefix:         /usr
 # should be required by devtools
 BuildRequires:  perl-XML-Writer pkgconfig rpm
@@ -44,12 +44,12 @@
 Summary:        YaST2 - Network Configuration
 
 %package devel-doc
-Version:        2.15.79
-Release:        2
+Version:        2.15.80
+Release:        1
 License:        GPL v2 or later
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-network-2.15.79.tar.bz2
+Source0:        yast2-network-2.15.80.tar.bz2
 Prefix:         /usr
 Requires:       yast2-network >= 2.15.53
 Summary:        YaST2 - Developer documentation for yast2-network
@@ -73,7 +73,7 @@
     Michal Svec <msvec@suse.cz>
 
 %prep
-%setup -n yast2-network-2.15.79
+%setup -n yast2-network-2.15.80
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -139,6 +139,9 @@
 %exclude %{prefix}/share/doc/packages/yast2-network/COPYRIGHT.english
 %exclude %{prefix}/share/doc/packages/yast2-network/README
 %changelog
+* Mon Sep 24 2007 - mzugec@suse.cz
+- for update system don't copy network from inst_sys (#325738)
+- 2.15.80
 * Fri Sep 21 2007 - kmachalkova@suse.cz
 - Remember correctly device number and device module for manually
   added cards (#308762)

++++++ yast2-network-2.15.79.tar.bz2 -> yast2-network-2.15.80.tar.bz2 ++++++
++++ 6645 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.15.79/configure.in new/yast2-network-2.15.80/configure.in
--- old/yast2-network-2.15.79/configure.in	2007-08-09 17:46:36.000000000 +0200
+++ new/yast2-network-2.15.80/configure.in	2007-09-24 10:55:35.000000000 +0200
@@ -1,9 +1,9 @@
 dnl configure.in for yast2-network
 dnl
-dnl -- This file is generated by y2autoconf 2.15.0 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.15.9 - DO NOT EDIT! --
 dnl    (edit configure.in.in instead)
 
-AC_INIT(yast2-network, 2.15.57, http://bugs.opensuse.org/, yast2-network)
+AC_INIT(yast2-network, 2.15.79, 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.15.57"
+VERSION="2.15.79"
 RPMNAME="yast2-network"
 MAINTAINER="Michal Zugec <mzugec@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-network-2.15.79/Makefile.am new/yast2-network-2.15.80/Makefile.am
--- old/yast2-network-2.15.79/Makefile.am	2007-08-09 17:46:36.000000000 +0200
+++ new/yast2-network-2.15.80/Makefile.am	2007-09-24 10:55:35.000000000 +0200
@@ -30,7 +30,7 @@
 
 extra_COPYRIGHT_files =  $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl))
 
-AUTOMAKE_OPTIONS = foreign dist-bzip2
+AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
 # where devtools instal m4 snippets
 # argh, executed literally
 #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
@@ -210,8 +210,7 @@
 
 # For po/ modules
 checkpo:
-	test ! -d $(srcdir)/po || $(MAKE) -C po checkpo
-#	test ! -d $(srcdir)/po \
-#	  || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; }
+	test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo
+#	test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox
 # No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am
 SUBDIRS = agents data doc src testsuite 
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.15.79/src/clients/save_network.ycp new/yast2-network-2.15.80/src/clients/save_network.ycp
--- old/yast2-network-2.15.79/src/clients/save_network.ycp	2007-09-20 18:46:51.000000000 +0200
+++ new/yast2-network-2.15.80/src/clients/save_network.ycp	2007-09-24 11:00:20.000000000 +0200
@@ -331,6 +331,7 @@
  */
 void save_network(){
 
+    y2milestone("starting save_network");
     // skip from chroot
     integer old_SCR = WFM::SCRGetDefault ();
     integer new_SCR = WFM::SCROpen ("chroot=/:scr", false);
@@ -410,6 +411,8 @@
 
 }
 
-save_network();
+// for update system don't copy network from inst_sys (#325738)
+if (!Mode::update()) save_network();
+	else y2milestone("update - skip save_network");
 /* 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-network-2.15.79/VERSION new/yast2-network-2.15.80/VERSION
--- old/yast2-network-2.15.79/VERSION	2007-09-21 12:25:08.000000000 +0200
+++ new/yast2-network-2.15.80/VERSION	2007-09-24 11:00:46.000000000 +0200
@@ -1 +1 @@
-2.15.79
+2.15.80


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠Hilbert.suse.de

tags

participants (1)