rpm/yast2-apparmor
SHA256
1
0
Fork 0
forked from pool/yast2-apparmor
Code Pull Requests Activity

Accepting request 77735 from home:jeff_mahoney:branches:YaST:Head

Browse Source 
- 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
This commit is contained in:
Stephan Kulow 2011-09-05 11:59:48 +00:00 committed by Git OBS Bridge
parent 0379179a7d
commit 3c7246943b
5 changed files with 17393 additions and 2 deletions

1697
yast2-apparmor-cleanup-names Normal file

File diff suppressed because it is too large Load Diff

76
yast2-apparmor-rename-desktop Normal file

@ -0,0 +1,76 @@
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

15603
yast2-apparmor-rename-files Normal file

File diff suppressed because it is too large Load Diff

9
yast2-apparmor.changes

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Tue Aug 2 23:26:27 CEST 2011 - jeffm@suse.de
- 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
-------------------------------------------------------------------
Fri Jul 22 16:39:45 CEST 2011 - locilka@suse.cz

10
yast2-apparmor.spec

@ -19,11 +19,14 @@
Name: yast2-apparmor
Version: 2.21.2
Version: 2.21.5
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-apparmor-2.21.2.tar.bz2
Patch1: yast2-apparmor-rename-files
Patch2: yast2-apparmor-cleanup-names
Patch3: yast2-apparmor-rename-desktop
Prefix: /usr
@ -54,6 +57,9 @@ SubDomain.
%prep
%setup -n yast2-apparmor-2.21.2
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
%{prefix}/bin/y2tool y2autoconf
@ -84,7 +90,7 @@ rm -rf "$RPM_BUILD_ROOT"
%defattr(-,root,root)
/usr/bin/*
/usr/share/YaST2/clients
/usr/share/YaST2/include/subdomain
/usr/share/YaST2/include/apparmor
# empty directory, commenting out
# /usr/share/YaST2/include/apparmor-reports
/usr/share/YaST2/scrconf