forked from pool/yast2-apparmor
- fixed .desktop file (bnc #681249)
------------------------------------------------------------------ OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-apparmor?expand=0&rev=21
This commit is contained in:
Stephan Kulow
Git OBS Bridge
parent
3c7246943b
commit
ad033b95f5
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:f444a01b154aa8d071b2214f3669bb5a9c5c70b591dcf5a7b43a966268dc69bd
|
|
||||||
size 151613
|
|
||||||
3
yast2-apparmor-2.21.3.tar.bz2
Normal file
3
yast2-apparmor-2.21.3.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:37b578fdbdf6d892737cbffa81e72fcad5d1406b8cc21b5ee34581b34e58d2b5
|
||||||
|
size 151461
|
||||||
File diff suppressed because it is too large
Load Diff
@ -1,76 +0,0 @@
|
|||||||
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
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Aug 5 12:21:26 CEST 2011 - tgoettlicher@suse.de
|
||||||
|
|
||||||
|
- fixed .desktop file (bnc #681249)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Aug 2 23:26:27 CEST 2011 - jeffm@suse.de
|
Tue Aug 2 23:26:27 CEST 2011 - jeffm@suse.de
|
||||||
|
|
||||||
|
|||||||
@ -1,46 +1,29 @@
|
|||||||
#
|
#
|
||||||
# spec file for package yast2-apparmor
|
# spec file for package yast2-apparmor (Version 2.21.3)
|
||||||
#
|
#
|
||||||
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
|
||||||
#
|
|
||||||
# All modifications and additions to the file contributed by third parties
|
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
|
||||||
# upon. The license for this file, and modifications and additions to the
|
|
||||||
# file, is the same license as for the pristine package itself (unless the
|
|
||||||
# license for the pristine package is not an Open Source License, in which
|
|
||||||
# case the license is the MIT License). An "Open Source License" is a
|
|
||||||
# license that conforms to the Open Source Definition (Version 1.9)
|
|
||||||
# published by the Open Source Initiative.
|
|
||||||
|
|
||||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
|
||||||
#
|
|
||||||
|
|
||||||
# norootforbuild
|
# norootforbuild
|
||||||
|
|
||||||
|
Name: yast2-apparmor
|
||||||
|
Version: 2.21.3
|
||||||
|
Release: 0
|
||||||
|
|
||||||
Name: yast2-apparmor
|
|
||||||
Version: 2.21.5
|
|
||||||
Release: 1
|
|
||||||
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
Source0: yast2-apparmor-2.21.2.tar.bz2
|
Source0: yast2-apparmor-2.21.3.tar.bz2
|
||||||
Patch1: yast2-apparmor-rename-files
|
|
||||||
Patch2: yast2-apparmor-cleanup-names
|
|
||||||
Patch3: yast2-apparmor-rename-desktop
|
|
||||||
|
|
||||||
Prefix: /usr
|
prefix: /usr
|
||||||
|
|
||||||
Group: Productivity/Security
|
Group: Productivity/Security
|
||||||
License: GPL v2 or later
|
License: GPL v2 or later
|
||||||
|
|
||||||
Summary: YaST2 - Plugins for AppArmor Profile Management
|
Summary: YaST2 - Plugins for AppArmor Profile Management
|
||||||
Requires: yast2 perl-TimeDate
|
Requires: yast2 perl-TimeDate
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
Obsoletes: yast2-subdomain
|
Obsoletes: yast2-subdomain
|
||||||
Provides: yast2-subdomain
|
Provides: yast2-subdomain
|
||||||
BuildRequires: update-desktop-files
|
BuildRequires: update-desktop-files
|
||||||
|
|
||||||
BuildRequires: yast2 yast2-devtools
|
BuildRequires: yast2 yast2-devtools
|
||||||
|
|
||||||
%if 0%{?suse_version} >= 1140
|
%if 0%{?suse_version} >= 1140
|
||||||
# openSUSE-11.4 or newer
|
# openSUSE-11.4 or newer
|
||||||
@ -56,10 +39,7 @@ This package is part of a suite of tools that used to be named
|
|||||||
SubDomain.
|
SubDomain.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -n yast2-apparmor-2.21.2
|
%setup -n yast2-apparmor-2.21.3
|
||||||
%patch1 -p1
|
|
||||||
%patch2 -p1
|
|
||||||
%patch3 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%{prefix}/bin/y2tool y2autoconf
|
%{prefix}/bin/y2tool y2autoconf
|
||||||
@ -83,6 +63,7 @@ for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name "*.desk
|
|||||||
%suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop}
|
%suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop}
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
rm -rf "$RPM_BUILD_ROOT"
|
rm -rf "$RPM_BUILD_ROOT"
|
||||||
|
|
||||||
@ -113,4 +94,3 @@ REPDIR3='/var/log/apparmor/reports-exported'
|
|||||||
[ -e $REPDIR ] || mkdir -p $REPDIR
|
[ -e $REPDIR ] || mkdir -p $REPDIR
|
||||||
[ -e $REPDIR2 ] || mkdir -p $REPDIR2
|
[ -e $REPDIR2 ] || mkdir -p $REPDIR2
|
||||||
[ -e $REPDIR3 ] || mkdir -p $REPDIR3
|
[ -e $REPDIR3 ] || mkdir -p $REPDIR3
|
||||||
%changelog
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user