Merge 285a0d5 into fb044d6

yast · Nov 25, 2018 · dd056b6 · dd056b6
2 parents fb044d6 + 285a0d5
commit dd056b6
Show file tree

Hide file tree

Showing 7 changed files with 132 additions and 3 deletions.
diff --git a/configure.in.in b/configure.in.in
@@ -4,6 +4,9 @@
 @YAST2-INIT-COMMON@
 @YAST2-INIT-YCP@
 
+icondir=/usr/share/icons
+AC_SUBST(icondir)
+
 ## some common checks
 @YAST2-CHECKS-COMMON@
 @YAST2-CHECKS-YCP@

diff --git a/package/yast2-dns-server.changes b/package/yast2-dns-server.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Nov 25 02:10:40 UTC 2018 - Stasiek Michalski <hellcp@mailbox.org>
+
+- Provide icon with module (boo#1109310)
+- 4.1.2
+
 -------------------------------------------------------------------
 Tue Oct 16 15:11:54 CEST 2018 - schubi@suse.de
 

diff --git a/package/yast2-dns-server.spec b/package/yast2-dns-server.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-dns-server
-Version:        4.1.1
+Version:        4.1.2
 Release:        0
 Url:            https://github.com/yast/yast-dns-server
 
@@ -99,6 +99,7 @@ This package contains the YaST2 component for DNS server configuration.
 %{yast_agentdir}/ag_convert_named_conf
 %{yast_schemadir}/autoyast/rnc/dns-server.rnc
 %doc %{yast_docdir}
+%{_datadir}/icons/*
 %license COPYING
 
 %changelog
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -53,6 +53,13 @@ schemafiles_DATA = \
 desktop_DATA = \
   desktop/dns-server.desktop
 
-EXTRA_DIST = $(module_DATA) $(module1_DATA) $(client_DATA) $(ynclude_DATA) $(scrconf_DATA) $(agent_SCRIPTS) $(schemafiles_DATA) $(desktop_DATA) $(ylib_DATA)
+symbolicdir = @icondir@/hicolor/symbolic/apps
+symbolic_DATA = \
+  icons/hicolor/symbolic/apps/yast-dns-server-symbolic.svg
+scalabledir = @icondir@/hicolor/scalable/apps
+scalable_DATA = \
+  icons/hicolor/scalable/apps/yast-dns-server.svg
+
+EXTRA_DIST = $(module_DATA) $(module1_DATA) $(client_DATA) $(ynclude_DATA) $(scrconf_DATA) $(agent_SCRIPTS) $(schemafiles_DATA) $(desktop_DATA) $(ylib_DATA) $(symbolic_DATA) $(scalable_DATA)
 
 include $(top_srcdir)/Makefile.am.common
diff --git a/src/icons/hicolor/scalable/apps/yast-dns-server.svg b/src/icons/hicolor/scalable/apps/yast-dns-server.svg
diff --git a/src/icons/hicolor/symbolic/apps/yast-dns-server-symbolic.svg b/src/icons/hicolor/symbolic/apps/yast-dns-server-symbolic.svg
diff --git a/src/include/dns-server/misc.rb b/src/include/dns-server/misc.rb
@@ -18,7 +18,7 @@ def initialize_dns_server_misc(include_target)
     end
 
     def SetDNSSErverIcon
-      Wizard.SetTitleIcon("yast-dns-server")
+      Wizard.SetDesktopIcon("dns-server")
 
       nil
     end