Provide icon with module (boo#1109310)

yast · Nov 24, 2018 · 18034ce · 18034ce
1 parent eac7045
commit 18034ce
Show file tree

Hide file tree

Showing 6 changed files with 732 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-http-server.changes b/package/yast2-http-server.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Nov 24 22:02:56 UTC 2018 - Stasiek Michalski <hellcp@mailbox.org>
+
+- Provide icon with module (boo#1109310)
+- 4.1.2
+
 -------------------------------------------------------------------
 Tue Oct 16 16:15:53 CEST 2018 - schubi@suse.de
 

diff --git a/package/yast2-http-server.spec b/package/yast2-http-server.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-http-server
-Version:        4.1.1
+Version:        4.1.2
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -65,4 +65,5 @@ configuration.
 %{yast_scrconfdir}/*
 %{yast_agentdir}/*
 %doc %{yast_docdir}
+%{_datadir}/icons/*
 %license COPYING
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -40,6 +40,13 @@ schemafiles_DATA = \
 desktop_DATA = \
   desktop/http-server.desktop
 
-EXTRA_DIST = $(module_DATA) $(module1_DATA) $(module2_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-http-server-symbolic.svg
+scalabledir = @icondir@/hicolor/scalable/apps
+scalable_DATA = \
+  icons/hicolor/scalable/apps/yast-http-server.svg
 
-include $(top_srcdir)/Makefile.am.common
+EXTRA_DIST = $(module_DATA) $(module1_DATA) $(module2_DATA) $(client_DATA) $(ynclude_DATA) $(scrconf_DATA) $(agent_SCRIPTS) $(schemafiles_DATA) $(desktop_DATA) $(symbolic_DATA) $(scalable_DATA)
+
+include $(top_srcdir)/Makefile.am.common