Merge pull request #31 from hellcp/master

Ship icon with module
yast · Nov 23, 2018 · aedc789 · aedc789
2 parents d0d0e88 + f50d3f3
commit aedc789
Show file tree

Hide file tree

Showing 8 changed files with 330 additions and 4 deletions.
diff --git a/configure.in.in b/configure.in.in
@@ -8,5 +8,8 @@
 @YAST2-CHECKS-COMMON@
 @YAST2-CHECKS-YCP@
 
+icondir=/usr/share/icons
+AC_SUBST(icondir)
+
 ## and generate the output...
 @YAST2-OUTPUT@
diff --git a/package/yast2-apparmor.changes b/package/yast2-apparmor.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Nov 23 14:14:25 UTC 2018 - Stasiek Michalski <hellcp@mailbox.org>
+
+- Provide icon with module (boo#1109310)
+
 -------------------------------------------------------------------
 Tue Oct 16 16:54:23 CEST 2018 - schubi@suse.de
 

diff --git a/package/yast2-apparmor.spec b/package/yast2-apparmor.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-apparmor
-Version:        4.1.0
+Version:        4.1.1
 Release:        0
 Summary:        YaST2 - Plugins for AppArmor Profile Management
 Url:            https://github.com/yast/yast-apparmor
@@ -54,6 +54,7 @@ profiles.
 %{yast_libdir}/apparmor
 %{yast_moduledir}
 %{yast_desktopdir}
+%{_datadir}/icons/*
 %doc %{yast_docdir}
 %license COPYING
 
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -32,6 +32,14 @@ ylib_DATA = \
 desktop_DATA = \
   desktop/apparmor.desktop
 
-EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(ylib_DATA) $(desktop_DATA)
+symbolicdir = @icondir@/hicolor/symbolic/apps
+symbolic_DATA = \
+  icons/hicolor/symbolic/apps/yast-apparmor-symbolic.svg
+
+scalabledir = @icondir@/hicolor/scalable/apps
+scalable_DATA = \
+  icons/hicolor/scalable/apps/yast-apparmor.svg
+
+EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(ylib_DATA) $(desktop_DATA) $(symbolic_DATA) $(scalable_DATA)
 
 include $(top_srcdir)/Makefile.am.common
diff --git a/src/desktop/apparmor.desktop b/src/desktop/apparmor.desktop
@@ -15,7 +15,7 @@ X-SuSE-YaST-SortKey=
 X-SuSE-YaST-AutoInstClonable=false
 X-SuSE-YaST-Keywords=security,LSM,MAC,DAC,access,control
 
-Icon=apparmor_view_profile
+Icon=yast-apparmor
 Exec=/usr/bin/xdg-su -c '/sbin/yast2 apparmor'
 
 Name=AppArmor Configuration

diff --git a/src/icons/hicolor/scalable/apps/yast-apparmor.svg b/src/icons/hicolor/scalable/apps/yast-apparmor.svg
diff --git a/src/icons/hicolor/symbolic/apps/yast-apparmor-symbolic.svg b/src/icons/hicolor/symbolic/apps/yast-apparmor-symbolic.svg
diff --git a/src/include/apparmor/aa-config.rb b/src/include/apparmor/aa-config.rb
@@ -119,7 +119,6 @@ def displayAppArmorConfig
 
       # May want to replace Wizard() with UI()
       Wizard.CreateDialog
-      Wizard.SetTitleIcon("apparmor/control_panel")
       Wizard.SetContentsButtons(
         caption,
         contents,