Merge pull request #26 from hellcp/master

package/yast2-multipath.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Nov 25 18:30:26 UTC 2018 - Stasiek Michalski <hellcp@mailbox.org>
+
+- Provide icon with module (boo#1109310)
+- 4.1.0
+
 -------------------------------------------------------------------
 Tue Oct 16 15:37:32 CEST 2018 - schubi@suse.de
 

package/yast2-multipath.spec

@@ -17,7 +17,7 @@
 
 
 Name:           yast2-multipath
-Version:        4.0.1
+Version:        4.1.0
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -68,5 +68,6 @@ You can configure your multipathed devices with this module.
 %{_prefix}/lib/YaST2/servers_non_y2/*
 %doc %{_prefix}/share/doc/packages/yast2-multipath
 %license COPYING
+%{yast_icondir}
 
 %changelog

src/Makefile.am

@@ -23,6 +23,13 @@ agent_SCRIPTS = \
 desktop_DATA = \
   desktop/multipath.desktop
 
-EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(scrconf_DATA) $(agent_SCRIPTS) $(desktop_DATA)
+symbolicdir = @icondir@/hicolor/symbolic/apps
+symbolic_DATA = \
+  icons/hicolor/symbolic/apps/yast-multipath-symbolic.svg
+scalabledir = @icondir@/hicolor/scalable/apps
+scalable_DATA = \
+  icons/hicolor/scalable/apps/yast-multipath.svg
 
-include $(top_srcdir)/Makefile.am.common
+EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(scrconf_DATA) $(agent_SCRIPTS) $(desktop_DATA) $(symbolic_DATA) $(scalable_DATA)
+
+include $(top_srcdir)/Makefile.am.common