Hello community,
here is the log from the commit of package yast2-runlevel for openSUSE:Factory
checked in at Fri Oct 14 13:58:10 CEST 2011.
--------
--- openSUSE:Factory/yast2-runlevel/yast2-runlevel.changes 2011-10-04
18:02:53.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-runlevel/yast2-runlevel.changes
2011-10-14 07:56:36.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Oct 13 10:07:35 UTC 2011 - jsrain@site
+
+- add a possibility to restart a running service (bnc#723623)
+- 2.21.3
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-runlevel-2.21.2.tar.bz2
New:
----
yast2-runlevel-2.21.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-runlevel.spec ++++++
--- /var/tmp/diff_new_pack.MXE9IV/_old 2011-10-14 13:58:07.000000000 +0200
+++ /var/tmp/diff_new_pack.MXE9IV/_new 2011-10-14 13:58:07.000000000 +0200
@@ -19,16 +19,14 @@
Name: yast2-runlevel
-Version: 2.21.2
+Version: 2.21.3
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-runlevel-%{version}.tar.bz2
-Prefix: /usr
-
Group: System/YaST
-License: GPL v2 or later
+License: GPL-2.0+
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools
yast2-testsuite
# systemd support in Service.ycp
@@ -51,23 +49,23 @@
%setup -n yast2-runlevel-%{version}
%build
-%{prefix}/bin/y2tool y2autoconf
-%{prefix}/bin/y2tool y2automake
+%{_prefix}/bin/y2tool y2autoconf
+%{_prefix}/bin/y2tool y2automake
autoreconf --force --install
export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
%{?suse_update_config:%{suse_update_config -f}}
-./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir}
+./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir}
# V=1: verbose build in case we used AM_SILENT_RULES(yes)
# so that RPM_OPT_FLAGS check works
make %{?jobs:-j%jobs} V=1
%install
make install DESTDIR="$RPM_BUILD_ROOT"
-[ -e "%{prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] ||
Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT"
-for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name
"*.desktop"` ; do
+[ -e "%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] ||
Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT"
+for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/ -name
"*.desktop"` ; do
d=${f##*/}
%suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop}
done
@@ -77,8 +75,8 @@
%files
%defattr(-,root,root)
-%dir %{prefix}/share/applications/YaST2
-%{prefix}/share/applications/YaST2/runlevel.desktop
+%dir %{_prefix}/share/applications/YaST2
+%{_prefix}/share/applications/YaST2/runlevel.desktop
%dir /usr/share/YaST2/scrconf
/usr/share/YaST2/scrconf/*.scr
%dir /usr/share/YaST2/clients
@@ -89,6 +87,6 @@
/usr/share/YaST2/modules/*.ycp
/usr/share/YaST2/modules/*.ybc
/usr/share/YaST2/schema/autoyast/rnc/*.rnc
-%doc %{prefix}/share/doc/packages/yast2-runlevel
+%doc %{_prefix}/share/doc/packages/yast2-runlevel
%changelog
++++++ yast2-runlevel-2.21.2.tar.bz2 -> yast2-runlevel-2.21.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-runlevel-2.21.2/VERSION
new/yast2-runlevel-2.21.3/VERSION
--- old/yast2-runlevel-2.21.2/VERSION 2011-09-29 13:34:05.000000000 +0200
+++ new/yast2-runlevel-2.21.3/VERSION 2011-10-14 07:54:47.000000000 +0200
@@ -1 +1 @@
-2.21.2
+2.21.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-runlevel-2.21.2/configure
new/yast2-runlevel-2.21.3/configure
--- old/yast2-runlevel-2.21.2/configure 2011-09-29 13:33:25.000000000 +0200
+++ new/yast2-runlevel-2.21.3/configure 2011-10-14 08:01:39.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for yast2-runlevel 2.21.1.
+# Generated by GNU Autoconf 2.68 for yast2-runlevel 2.21.3.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-runlevel'
PACKAGE_TARNAME='yast2-runlevel'
-PACKAGE_VERSION='2.21.1'
-PACKAGE_STRING='yast2-runlevel 2.21.1'
+PACKAGE_VERSION='2.21.3'
+PACKAGE_STRING='yast2-runlevel 2.21.3'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1231,7 +1231,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-runlevel 2.21.1 to adapt to many kinds of
systems.
+\`configure' configures yast2-runlevel 2.21.3 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1302,7 +1302,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-runlevel 2.21.1:";;
+ short | recursive ) echo "Configuration of yast2-runlevel 2.21.3:";;
esac
cat <<\_ACEOF
@@ -1382,7 +1382,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-runlevel configure 2.21.1
+yast2-runlevel configure 2.21.3
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1399,7 +1399,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-runlevel $as_me 2.21.1, which was
+It was created by yast2-runlevel $as_me 2.21.3, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2329,7 +2329,7 @@
# Define the identity of the package.
PACKAGE='yast2-runlevel'
- VERSION='2.21.1'
+ VERSION='2.21.3'
cat >>confdefs.h <<_ACEOF
@@ -2451,7 +2451,7 @@
-VERSION="2.21.1"
+VERSION="2.21.3"
RPMNAME="yast2-runlevel"
MAINTAINER="Lukas Ocilka <[email protected]>"
@@ -3470,7 +3470,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-runlevel $as_me 2.21.1, which was
+This file was extended by yast2-runlevel $as_me 2.21.3, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3523,7 +3523,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-yast2-runlevel config.status 2.21.1
+yast2-runlevel config.status 2.21.3
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-runlevel-2.21.2/configure.in
new/yast2-runlevel-2.21.3/configure.in
--- old/yast2-runlevel-2.21.2/configure.in 2011-09-29 13:33:22.000000000
+0200
+++ new/yast2-runlevel-2.21.3/configure.in 2011-10-14 08:01:36.000000000
+0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-runlevel
dnl
-dnl -- This file is generated by y2autoconf 2.21.2 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.21.5 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-runlevel, 2.21.1, http://bugs.opensuse.org/, yast2-runlevel)
+AC_INIT(yast2-runlevel, 2.21.3, http://bugs.opensuse.org/, yast2-runlevel)
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.21.1"
+VERSION="2.21.3"
RPMNAME="yast2-runlevel"
MAINTAINER="Lukas Ocilka <[email protected]>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-runlevel-2.21.2/src/ui.ycp
new/yast2-runlevel-2.21.3/src/ui.ycp
--- old/yast2-runlevel-2.21.2/src/ui.ycp 2011-09-29 13:32:15.000000000
+0200
+++ new/yast2-runlevel-2.21.3/src/ui.ycp 2011-10-14 07:55:21.000000000
+0200
@@ -13,7 +13,7 @@
* Petr Blahos <[email protected]>
* Martin Lazar <[email protected]>
*
- * $Id: ui.ycp 60728 2010-02-08 13:52:28Z locilka $
+ * $Id: ui.ycp 66433 2011-10-14 05:49:52Z jsrain $
*
* Runlevel editor user interface functions.
*/
@@ -1129,6 +1129,8 @@
// menu item
`item (`id (`stop), _("S&top now ...")),
// menu item
+ `item (`id (`restart), _("R&estart now ...")),
+ // menu item
`item (`id (`status), _("&Refresh status ...")),
]),
`HStretch (),
@@ -1280,8 +1282,13 @@
Popup::Message (_("Each service was enabled\nin the
appropriate runlevels."));
}
}
- else if (`start == ret || `stop == ret)
+ else if (`start == ret || `stop == ret || `restart == ret)
{
+ // restarting a service which is not started equals to its
starting
+ // and dependency check is needed
+ if (`restart == ret && 0 != Service::Status
(current_service)) {
+ ret = `start;
+ }
boolean really = true;
if (`stop == ret && contains (["xdm", "earlyxdm"],
current_service))
{
@@ -1293,7 +1300,13 @@
}
if (really)
{
- StartStopServiceDep (current_service, ret == `start);
+ if (ret == `restart) {
+ list ret = startStopService (current_service,
"restart");
+ y2internal ("Ret: %1", ret);
+ Popup::LongText ("", `RichText(ret[1]:""), 70, 5);
+ } else {
+ StartStopServiceDep (current_service, ret ==
`start);
+ }
}
}
else if (`status == ret)
continue with "q"...
Remember to have fun...
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
