Merge pull request #40 from hellcp/master

yast · Nov 28, 2018 · 20ad7e2 · 20ad7e2
2 parents bd2d92a + e6fda7b
commit 20ad7e2
Show file tree

Hide file tree

Showing 5 changed files with 135 additions and 3 deletions.
diff --git a/package/yast2-dhcp-server.changes b/package/yast2-dhcp-server.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Nov 25 11:56:52 UTC 2018 - Stasiek Michalski <hellcp@mailbox.org>
+
+- Provide icon with module (boo#1109310)
+- 4.1.4
+
 -------------------------------------------------------------------
 Tue Oct 16 16:13:23 CEST 2018 - schubi@suse.de
 

diff --git a/package/yast2-dhcp-server.spec b/package/yast2-dhcp-server.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-dhcp-server
-Version:        4.1.3
+Version:        4.1.4
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -75,5 +75,6 @@ rake test:unit
 %{yast_agentdir}/ag_dhcpd_conf
 %doc %{yast_docdir}
 %license COPYING
+%{yast_icondir}
 %{yast_schemadir}/autoyast/rnc/dhcp-server.rnc
 
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -42,6 +42,13 @@ schemafiles_DATA = \
 desktop_DATA = \
   desktop/dhcp-server.desktop
 
-EXTRA_DIST = $(module_DATA) $(module1_DATA) $(client_DATA) $(ynclude_DATA) $(scrconf_DATA) $(agent_SCRIPTS) $(schemafiles_DATA) $(desktop_DATA)
+symbolicdir = @icondir@/hicolor/symbolic/apps
+symbolic_DATA = \
+  icons/hicolor/symbolic/apps/yast-dhcp-server-symbolic.svg
+scalabledir = @icondir@/hicolor/scalable/apps
+scalable_DATA = \
+  icons/hicolor/scalable/apps/yast-dhcp-server.svg
 
-include $(top_srcdir)/Makefile.am.common
+EXTRA_DIST = $(module_DATA) $(module1_DATA) $(client_DATA) $(ynclude_DATA) $(scrconf_DATA) $(agent_SCRIPTS) $(schemafiles_DATA) $(desktop_DATA) $(symbolic_DATA) $(scalable_DATA)
+
+include $(top_srcdir)/Makefile.am.common
diff --git a/src/icons/hicolor/scalable/apps/yast-dhcp-server.svg b/src/icons/hicolor/scalable/apps/yast-dhcp-server.svg
diff --git a/src/icons/hicolor/symbolic/apps/yast-dhcp-server-symbolic.svg b/src/icons/hicolor/symbolic/apps/yast-dhcp-server-symbolic.svg