From 0be66761f246f3a2e65395f4d374175793a85cb8af0c81d72ffc6bebd8031668 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Mon, 5 Mar 2018 13:56:18 +0000
Subject: [PATCH] Accepting request 581240 from GNOME:Next

spec-cleaner

OBS-URL: https://build.opensuse.org/request/show/581240
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gucharmap?expand=0&rev=147
---
 gucharmap.changes | 19 +++++++++++++++++++
 gucharmap.spec    | 41 +++++++++++++++++------------------------
 2 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/gucharmap.changes b/gucharmap.changes
index 3bc1b43..fccd5e9 100644
--- a/gucharmap.changes
+++ b/gucharmap.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Wed Feb 28 16:33:05 UTC 2018 - dimstar@opensuse.org
+
+- Modernize spec-file by calling spec-cleaner
+
+-------------------------------------------------------------------
+Thu Nov  2 17:54:58 UTC 2017 - luc14n0@linuxmail.org
+
+- Update Url to https://wiki.gnome.org/Apps/Gucharmap: current
+  Gucharmap's web page.
+- Add pkgconfig(glib-2.0) BuildRequires: missing declaration of
+  dependency, it was already being used thanks to
+  pkgconfig(gio-2.0) BuildRequires that lives in the same devel
+  package that provides glib-2.0.
+- Drop perl(Env) and libxml2-tools BuildRequires since they are not
+  being used or needed.
+- Points fdupes to removal of duplicates under the data directory
+  rather than the whole build root.
+
 -------------------------------------------------------------------
 Wed Nov  1 11:43:07 UTC 2017 - dimstar@opensuse.org
 
diff --git a/gucharmap.spec b/gucharmap.spec
index eb6d5fa..cbef0b4 100644
--- a/gucharmap.spec
+++ b/gucharmap.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package gucharmap
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,35 +20,34 @@
 %define so_api _2_90
 %define so_gucharmap 7
 %define pc_api 2.90
-
 Name:           gucharmap
 Version:        10.0.3
 Release:        0
 Summary:        A Featureful Unicode Character Map
-License:        GPL-3.0+ and LGPL-2.1+
+License:        GPL-3.0-or-later AND LGPL-2.1-or-later
 Group:          System/GUI/GNOME
-Url:            http://gucharmap.sourceforge.net/
-Source:         http://download.gnome.org/sources/gucharmap/10.0/%{name}-%{version}.tar.xz
+URL:            https://wiki.gnome.org/Apps/Gucharmap
+Source:         https://download.gnome.org/sources/gucharmap/10.0/%{name}-%{version}.tar.xz
 BuildRequires:  appdata-tools
 BuildRequires:  fdupes
 BuildRequires:  gettext
-BuildRequires:  gobject-introspection-devel
+BuildRequires:  gobject-introspection-devel >= 0.9.0
 BuildRequires:  gtk-doc
 BuildRequires:  gtk3-devel >= 3.4.0
 BuildRequires:  intltool
-BuildRequires:  libxml2-tools
-%if !0%{?is_opensuse}
-BuildRequires:  translation-update-upstream
-%endif
+BuildRequires:  pkgconfig
 BuildRequires:  unicode-ucd
 BuildRequires:  unicode-ucd-unihan
 BuildRequires:  unzip
 BuildRequires:  update-desktop-files
 BuildRequires:  yelp-tools
-BuildRequires:  perl(Env)
 BuildRequires:  pkgconfig(gio-2.0) >= 2.32.0
+BuildRequires:  pkgconfig(glib-2.0) >= 2.32.0
+Recommends:     %{name}-doc
 Recommends:     %{name}-lang
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%if !0%{?is_opensuse}
+BuildRequires:  translation-update-upstream
+%endif
 
 %description
 Gucharmap is a featureful unicode character map.
@@ -83,6 +82,7 @@ This package contains all necessary include files and libraries needed
 to develop applications that require these.
 
 %lang_package
+
 %prep
 %setup -q
 %if !0%{?is_opensuse}
@@ -98,24 +98,20 @@ translation-update-upstream
 make %{?_smp_mflags}
 
 %install
-%makeinstall
-find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
+%make_install
+find %{buildroot} -type f -name "*.la" -delete -print
 %find_lang %{name} %{?no_lang_C}
 # We need X-SuSE-Editor to avoid an error for the categories check. We don't
 # want TextEditor, since that's too wide.
 %suse_update_desktop_file -N "GNOME Character Map" -G "Character Map" %{name} X-SuSE-Editor
-%fdupes $RPM_BUILD_ROOT
+%fdupes -s %{buildroot}%{_datadir}
 
 %post -n libgucharmap%{so_api}-%{so_gucharmap} -p /sbin/ldconfig
-
 %postun -n libgucharmap%{so_api}-%{so_gucharmap} -p /sbin/ldconfig
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-,root,root)
-%doc COPYING ChangeLog NEWS
+%license COPYING
+%doc ChangeLog NEWS
 %{_bindir}/charmap
 %{_bindir}/gnome-character-map
 %{_bindir}/gucharmap
@@ -127,17 +123,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/metainfo/gucharmap.appdata.xml
 
 %files -n libgucharmap%{so_api}-%{so_gucharmap}
-%defattr(-,root,root)
 %{_libdir}/libgucharmap%{so_api}.so.%{so_gucharmap}*
 
 %files -n typelib-1_0-Gucharmap-2_90
-%defattr(-,root,root)
 %{_libdir}/girepository-1.0/Gucharmap-2.90.typelib
 
 %files lang -f %{name}.lang
 
 %files devel
-%defattr (-, root, root)
 %{_includedir}/gucharmap-%{pc_api}/
 %{_libdir}/libgucharmap%{so_api}.so
 %{_libdir}/pkgconfig/gucharmap-%{pc_api}.pc