Hello community,
here is the log from the commit of package yast2
checked in at Tue Feb 19 10:57:06 CET 2008.
--------
--- yast2/yast2.changes 2008-02-18 20:55:26.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2008-02-19 10:56:21.068867000 +0100
@@ -56,0 +57,6 @@
+Mon Feb 4 18:07:47 CET 2008 - mzugec@suse.de
+
+- Confirm::RunningNetwork() moved to
+ NetworkService::NetworkRunningPopup()
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.W10758/_old 2008-02-19 10:56:50.000000000 +0100
+++ /var/tmp/diff_new_pack.W10758/_new 2008-02-19 10:56:50.000000000 +0100
@@ -13,7 +13,7 @@
Name: yast2
Version: 2.16.28
-Release: 1
+Release: 2
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -140,7 +140,7 @@
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
%{?suse_update_config:%{suse_update_config -f}}
./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir}
-make -k %{?jobs:-j%jobs} || make -k || make
+make %{?jobs:-j%jobs}
# removed explicit adding of translations to group desktop files, since it is covered by the general call (they are in a subdirectory) and it caused build fail
%install
@@ -233,6 +233,7 @@
%doc %{prefix}/share/doc/packages/yast2/system
%doc %{prefix}/share/doc/packages/yast2/types
%doc %{prefix}/share/doc/packages/yast2/wizard
+
%changelog
* Mon Feb 18 2008 coolo@suse.de
- fix build
@@ -262,6 +263,9 @@
- Progress.ycp: Use the presence of progress bar widget to determine
whether some progress is running (querying progress counter is not
enough, previous modules might have failed to reset it correctly)
+* Mon Feb 04 2008 mzugec@suse.de
+- Confirm::RunningNetwork() moved to
+ NetworkService::NetworkRunningPopup()
* Fri Feb 01 2008 locilka@suse.cz
- Added new functions into the URL module: MakeMapFromParams and
MakeParamsFromMap.
++++++ yast2-2.16.28.tar.bz2 ++++++
++++ 3577 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.16.28/configure.in new/yast2-2.16.28/configure.in
--- old/yast2-2.16.28/configure.in 2008-02-14 17:13:55.000000000 +0100
+++ new/yast2-2.16.28/configure.in 2008-02-04 18:03:06.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2
dnl
-dnl -- This file is generated by y2autoconf 2.16.4 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.16.3 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2, 2.16.26, http://bugs.opensuse.org/, yast2)
+AC_INIT(yast2, 2.16.28, http://bugs.opensuse.org/, yast2)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.16.26"
+VERSION="2.16.28"
RPMNAME="yast2"
MAINTAINER="Jiri Srain "
@@ -118,7 +118,7 @@
dnl no need for AC_ARG_VAR
AC_PATH_PROG(XGETTEXT, xgettext)
if test -z "$XGETTEXT" ; then
- AC_MSG_ERROR(xgettext is missing; please install gettext-tools.)
+ AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
fi
Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
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.16.28/library/network/src/NetworkService.ycp new/yast2-2.16.28/library/network/src/NetworkService.ycp
--- old/yast2-2.16.28/library/network/src/NetworkService.ycp 2007-12-05 10:05:39.000000000 +0100
+++ new/yast2-2.16.28/library/network/src/NetworkService.ycp 2008-02-04 18:09:45.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Init script handling, ifup vs NetworkManager
* Authors: Martin Vidner
*
- * $Id: NetworkService.ycp 38231 2007-06-01 07:52:51Z mzugec $
+ * $Id: NetworkService.ycp 44622 2008-02-19 09:44:08Z mzugec $
*
* This module used to switch between rcnetwork and rcnetworkmanager.
* Now the master switch is /etc/sysconfig/network/config:NETWORKMANAGER
@@ -17,6 +17,7 @@
import "Service";
import "NetworkConfig";
import "Popup";
+import "Mode";
textdomain "base";
@@ -142,5 +143,28 @@
}
+
+/**
+ * If there is network running, return true.
+ * Otherwise show error popup depending on Mode and return false
+ * @return true if network running
+ */
+global define boolean RunningNetworkPopup()
+{
+ if (isNetworkRunning()) return true;
+ else {
+ string error_text = _("No running network detected!");
+ if (Mode::installation()) error_text = sformat("%1\n%2", error_text, _("Restart installation and configure network in Linuxrc."));
+ else error_text = sformat("%1\n%2", error_text,
+_("Configure network with YaST or NetworkManager-plugin
+and start this module again."));
+ Popup::Error(error_text);
+ y2error("Network not runing!");
+ return false;
+ }
+}
+
+
+
/* 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.16.28/library/wizard/src/Confirm.ycp new/yast2-2.16.28/library/wizard/src/Confirm.ycp
--- old/yast2-2.16.28/library/wizard/src/Confirm.ycp 2008-02-15 11:22:44.000000000 +0100
+++ new/yast2-2.16.28/library/wizard/src/Confirm.ycp 2008-02-04 18:09:45.000000000 +0100
@@ -9,7 +9,7 @@
*
* Flags: Stable
*
- * $Id: Confirm.ycp 44468 2008-02-14 16:35:59Z mzugec $
+ * $Id: Confirm.ycp 44622 2008-02-19 09:44:08Z mzugec $
*/
{
@@ -23,7 +23,6 @@
import "Popup";
import "Linuxrc";
import "Stage";
-import "NetworkService";
// #TODO bug number
map detection_cache = $[];
@@ -135,28 +134,6 @@
}
/**
- * If there is network running, return true.
- * Otherwise show error popup depending on Mode and return false
- * @return true if network running
- */
-global define boolean RunningNetwork()
-{
- if (NetworkService::isNetworkRunning()) return true;
- else {
- string error_text = _("No running network detected!");
- if (Mode::installation()) error_text = sformat("%1\n%2", error_text, _("Restart installation and configure network in Linuxrc."));
- else error_text = sformat("%1\n%2", error_text,
-_("Configure network with YaST or NetworkManager-plugin
-and start this module again."));
- Popup::Error(error_text);
- y2error("Network not runing!");
- return false;
- }
-}
-
-
-
-/**
* Opens a popup yes/no confirmation.
* If users confirms deleting, return true,
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org