From 081cc110aa12fc076aa93bb3960a7a8e939d35e3 Mon Sep 17 00:00:00 2001 From: Noah Davis Date: Sat, 24 Nov 2018 18:43:12 -0500 Subject: [PATCH 1/5] Provide icon with module --- configure.in.in | 3 +++ package/yast2-printer.changes | 5 +++++ package/yast2-printer.spec | 4 +++- src/Makefile.am | 12 ++++++++++-- src/icons/hicolor/scalable/apps/yast-printer.svg | 1 + .../hicolor/symbolic/apps/yast-printer-symbolic.svg | 1 + 6 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 src/icons/hicolor/scalable/apps/yast-printer.svg create mode 100644 src/icons/hicolor/symbolic/apps/yast-printer-symbolic.svg diff --git a/configure.in.in b/configure.in.in index a9d37025..761df29c 100644 --- a/configure.in.in +++ b/configure.in.in @@ -15,5 +15,8 @@ fi @YAST2-CHECKS-COMMON@ @YAST2-CHECKS-YCP@ +icondir=/usr/share/icons +AC_SUBST(icondir) + ## and generate the output... @YAST2-OUTPUT@ diff --git a/package/yast2-printer.changes b/package/yast2-printer.changes index c6a71626..cf6e55bb 100644 --- a/package/yast2-printer.changes +++ b/package/yast2-printer.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Nov 25 23:27:32 UTC 2018 - Noah Davis + +- Provide icon with module (boo#1109310) + ------------------------------------------------------------------- Mon Aug 20 10:18:00 CEST 2018 - schubi@suse.de diff --git a/package/yast2-printer.spec b/package/yast2-printer.spec index 5ef11930..ea16e82d 100644 --- a/package/yast2-printer.spec +++ b/package/yast2-printer.spec @@ -17,7 +17,7 @@ Name: yast2-printer -Version: 4.0.2 +Version: 4.0.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -96,6 +96,8 @@ chmod 755 %{my_requires} %{yast_ybindir}/test_remote_smb %{yast_ybindir}/test_remote_socket %{yast_ybindir}/basicadd_displaytest +%{_datadir}/icons/* + #Documentation %dir %{yast_docdir} %license COPYING diff --git a/src/Makefile.am b/src/Makefile.am index 924afccb..1586bbe0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -33,6 +33,14 @@ schemafiles_DATA = \ desktop_DATA = \ desktop/printer.desktop -EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(schemafiles_DATA) $(desktop_DATA) +symbolicdir = @icondir@/hicolor/symbolic/apps +symbolic_DATA = \ + icons/hicolor/symbolic/apps/yast-printer-symbolic.svg -include $(top_srcdir)/Makefile.am.common \ No newline at end of file +scalabledir = @icondir@/hicolor/scalable/apps +scalable_DATA = \ + icons/hicolor/scalable/apps/yast-printer.svg + +EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(schemafiles_DATA) $(desktop_DATA) $(symbolic_DATA) $(scalable_DATA) + +include $(top_srcdir)/Makefile.am.common diff --git a/src/icons/hicolor/scalable/apps/yast-printer.svg b/src/icons/hicolor/scalable/apps/yast-printer.svg new file mode 100644 index 00000000..2c9c1b4b --- /dev/null +++ b/src/icons/hicolor/scalable/apps/yast-printer.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/hicolor/symbolic/apps/yast-printer-symbolic.svg b/src/icons/hicolor/symbolic/apps/yast-printer-symbolic.svg new file mode 100644 index 00000000..865b45bc --- /dev/null +++ b/src/icons/hicolor/symbolic/apps/yast-printer-symbolic.svg @@ -0,0 +1 @@ + \ No newline at end of file From 9f90f39459b09f4b88bbfc7d5ea2c283b5c7bd27 Mon Sep 17 00:00:00 2001 From: Noah Davis Date: Mon, 26 Nov 2018 15:43:09 -0500 Subject: [PATCH 2/5] Change icon style --- src/icons/hicolor/scalable/apps/yast-printer.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/icons/hicolor/scalable/apps/yast-printer.svg b/src/icons/hicolor/scalable/apps/yast-printer.svg index 2c9c1b4b..28d03eb9 100644 --- a/src/icons/hicolor/scalable/apps/yast-printer.svg +++ b/src/icons/hicolor/scalable/apps/yast-printer.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file From 152166ea74a9cc3f8d4aa01eb9a1264f023aac20 Mon Sep 17 00:00:00 2001 From: Noah Davis Date: Mon, 26 Nov 2018 15:44:11 -0500 Subject: [PATCH 3/5] Add version to changes --- package/yast2-printer.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/package/yast2-printer.changes b/package/yast2-printer.changes index cf6e55bb..8c3e74eb 100644 --- a/package/yast2-printer.changes +++ b/package/yast2-printer.changes @@ -2,6 +2,7 @@ Sun Nov 25 23:27:32 UTC 2018 - Noah Davis - Provide icon with module (boo#1109310) +- 4.0.3 ------------------------------------------------------------------- Mon Aug 20 10:18:00 CEST 2018 - schubi@suse.de From 46abd4d0161fcab2c219b75ad057e5bae96019f9 Mon Sep 17 00:00:00 2001 From: Noah Davis Date: Wed, 28 Nov 2018 02:40:30 -0500 Subject: [PATCH 4/5] Use devtools --- configure.in.in | 4 ++-- package/yast2-printer.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.in.in b/configure.in.in index 761df29c..067c5f72 100644 --- a/configure.in.in +++ b/configure.in.in @@ -15,8 +15,8 @@ fi @YAST2-CHECKS-COMMON@ @YAST2-CHECKS-YCP@ -icondir=/usr/share/icons -AC_SUBST(icondir) + + ## and generate the output... @YAST2-OUTPUT@ diff --git a/package/yast2-printer.spec b/package/yast2-printer.spec index ea16e82d..3e8df568 100644 --- a/package/yast2-printer.spec +++ b/package/yast2-printer.spec @@ -96,7 +96,7 @@ chmod 755 %{my_requires} %{yast_ybindir}/test_remote_smb %{yast_ybindir}/test_remote_socket %{yast_ybindir}/basicadd_displaytest -%{_datadir}/icons/* +%{yast_icondir} #Documentation %dir %{yast_docdir} From c3077816ec52d6de52cece80e155da409b468369 Mon Sep 17 00:00:00 2001 From: Noah Davis Date: Wed, 28 Nov 2018 16:08:33 -0500 Subject: [PATCH 5/5] Format configure.in.in --- configure.in.in | 3 --- 1 file changed, 3 deletions(-) diff --git a/configure.in.in b/configure.in.in index 067c5f72..a9d37025 100644 --- a/configure.in.in +++ b/configure.in.in @@ -15,8 +15,5 @@ fi @YAST2-CHECKS-COMMON@ @YAST2-CHECKS-YCP@ - - - ## and generate the output... @YAST2-OUTPUT@