ref: refs/heads/backgroud_patches_bnc550934
commit 06e3b50839f88ed12e816e0badad4e919c0b75f9
Author: Jiri Suchomel
Date: Fri Nov 20 11:41:33 2009 +0100
- different fix of bnc#557131: install shortcuts.yml as disabled
- 0.0.14
---
plugins/services/README | 2 +-
.../package/yast2-webclient-services.changes | 6 ++++++
.../services/package/yast2-webclient-services.spec | 11 ++++++-----
plugins/services/shortcuts.yml | 14 +++++++-------
4 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/plugins/services/README b/plugins/services/README
index f55ba1a..a06032b 100644
--- a/plugins/services/README
+++ b/plugins/services/README
@@ -1,7 +1,7 @@
Services
=========
-Plugin for hanling system services.
+Plugin for handling system services.
Copyright (c) 2009 Novell
diff --git a/plugins/services/package/yast2-webclient-services.changes b/plugins/services/package/yast2-webclient-services.changes
index e009909..7440c32 100644
--- a/plugins/services/package/yast2-webclient-services.changes
+++ b/plugins/services/package/yast2-webclient-services.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Fri Nov 20 10:57:44 CET 2009 - jsuchome@suse.cz
+
+- different fix of bnc#557131: install shortcuts.yml as disabled
+- 0.0.14
+
+-------------------------------------------------------------------
Fri Nov 20 09:24:51 CET 2009 - jsuchome@suse.cz
- comment shortcuts.yml so the module does not appear in the
diff --git a/plugins/services/package/yast2-webclient-services.spec b/plugins/services/package/yast2-webclient-services.spec
index 8bc189e..773c868 100644
--- a/plugins/services/package/yast2-webclient-services.spec
+++ b/plugins/services/package/yast2-webclient-services.spec
@@ -15,16 +15,13 @@ Provides: yast2-webclient:/srv/www/yast/app/controllers/services_controlle
License: GPL v2 only
Group: Productivity/Networking/Web/Utilities
Autoreqprov: on
-Version: 0.0.13
+Version: 0.0.14
Release: 0
Summary: YaST2 - Webclient - Services
Source: www.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
-# check for empty shortcuts.yml
-Requires: yast2-webclient >= 0.0.16
-
#
%define pkg_user yast
%define plugin_name services
@@ -56,6 +53,10 @@ mkdir -p $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}
cp -a * $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}
rm -f $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/COPYING
+# rename shortcuts.yml as it is not needed for now
+mv $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/shortcuts.yml \
+$RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/disabled-shortcuts.yml
+
# remove .po files (no longer needed)
rm -rf $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/po
# search locale files
@@ -77,8 +78,8 @@ rm -rf $RPM_BUILD_ROOT
/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/install.rb
/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/uninstall.rb
/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/app
-/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/shortcuts.yml
/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/tasks
/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/config
+/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/disabled-shortcuts.yml
%doc COPYING
diff --git a/plugins/services/shortcuts.yml b/plugins/services/shortcuts.yml
index 2069e7a..1560550 100644
--- a/plugins/services/shortcuts.yml
+++ b/plugins/services/shortcuts.yml
@@ -1,8 +1,8 @@
-# This plugin is actually excluded from the menu, to re-enable it, uncomment the lines.
+# This plugin is excluded from the menu, to re-enable it, rename this file to shortcuts.yml
main:
-# icon: '/icons/yast-system.png'
-# url: /services
-# groups: [ System ]
-# tags: [ init, script, service ]
-# title: System Services
-# description: Manage the LSB init scripts
+ icon: '/icons/yast-system.png'
+ url: /services
+ groups: [ System ]
+ tags: [ init, script, service ]
+ title: System Services
+ description: Manage the LSB init scripts
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
