1
0
yast2-apparmor/yast2-apparmor-rename-desktop
Stephan Kulow 3c7246943b Accepting request 77735 from home:jeff_mahoney:branches:YaST:Head
- Rename files to use proper AppArmor names and abbreviations
- Change code to reflect new names
  - Basic version needed to use newer perl-apparmor. This version
    gets rid of the old SubDomain names entirely.
- Move yast2-apparmor.desktop to apparmor.desktop


-- NOTE: Without (even a simple version of) these changes, yast2-apparmor
   doesn't work on openSUSE Factory. This is due to perl-apparmor renaming
   Immunix::Subdomain to Immunix::Apparmor, but this is the more complete fix.

OBS-URL: https://build.opensuse.org/request/show/77735
OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-apparmor?expand=0&rev=20
2011-09-05 11:59:48 +00:00

77 lines
2.0 KiB
Plaintext

From: Jeff Mahoney <jeffm@suse.com>
Subject: yast2-apparmor: Rename yast2-apparmor.desktop to apparmor.desktop
The yast2 code appears to look for apparmor.desktop, not
yast2-apparmor.desktop This patch renames the file to the right name.
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
---
src/desktop/Makefile.am | 2 +-
src/desktop/apparmor.desktop | 24 ++++++++++++++++++++++++
src/desktop/yast2-apparmor.desktop | 24 ------------------------
3 files changed, 25 insertions(+), 25 deletions(-)
--- a/src/desktop/Makefile.am
+++ b/src/desktop/Makefile.am
@@ -1,5 +1,5 @@
desktop_DATA = \
- yast2-apparmor.desktop
+ apparmor.desktop
rncdir = $(schemadir)/autoyast/rnc
rnc_DATA =
--- /dev/null
+++ b/src/desktop/apparmor.desktop
@@ -0,0 +1,24 @@
+[Desktop Entry]
+Type=Application
+Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-AppArmor;
+
+X-KDE-ModuleType=Library
+X-KDE-RootOnly=true
+X-KDE-HasReadOnlyMode=true
+X-KDE-Library=yast2
+X-SuSE-YaST-Call=apparmor
+
+X-SuSE-YaST-Group=Security
+X-SuSE-YaST-Argument=
+X-SuSE-YaST-RootOnly=true
+X-SuSE-YaST-AutoInst=none
+X-SuSE-YaST-Geometry=
+X-SuSE-YaST-SortKey=
+X-SuSE-YaST-AutoInstClonable=false
+
+Icon=apparmor_view_profile
+Exec=/usr/bin/xdg-su -c '/sbin/yast2 apparmor'
+
+Name=AppArmor Configuration
+GenericName=AppArmor Configuration
+StartupNotify=true
--- a/src/desktop/yast2-apparmor.desktop
+++ /dev/null
@@ -1,24 +0,0 @@
-[Desktop Entry]
-Type=Application
-Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-AppArmor;
-
-X-KDE-ModuleType=Library
-X-KDE-RootOnly=true
-X-KDE-HasReadOnlyMode=true
-X-KDE-Library=yast2
-X-SuSE-YaST-Call=apparmor
-
-X-SuSE-YaST-Group=Security
-X-SuSE-YaST-Argument=
-X-SuSE-YaST-RootOnly=true
-X-SuSE-YaST-AutoInst=none
-X-SuSE-YaST-Geometry=
-X-SuSE-YaST-SortKey=
-X-SuSE-YaST-AutoInstClonable=false
-
-Icon=apparmor_view_profile
-Exec=/usr/bin/xdg-su -c '/sbin/yast2 apparmor'
-
-Name=AppArmor Configuration
-GenericName=AppArmor Configuration
-StartupNotify=true