From ba39e84929e093d254c1684aed18e364b1ec2c27006b000cbf8794f2aaf8b8b0 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Mon, 5 Mar 2018 13:51:23 +0000
Subject: [PATCH] Accepting request 581147 from GNOME:Next

spec-cleaner

OBS-URL: https://build.opensuse.org/request/show/581147
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-doc-utils?expand=0&rev=82
---
 gnome-doc-utils.changes |  5 +++++
 gnome-doc-utils.spec    | 37 ++++++++++++++++---------------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/gnome-doc-utils.changes b/gnome-doc-utils.changes
index 06614ef..676886f 100644
--- a/gnome-doc-utils.changes
+++ b/gnome-doc-utils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Feb 28 16:28:06 UTC 2018 - dimstar@opensuse.org
+
+- Modernize spec-file by calling spec-cleaner
+
 -------------------------------------------------------------------
 Tue Sep 17 14:00:44 UTC 2013 - fcrozat@suse.com
 
diff --git a/gnome-doc-utils.spec b/gnome-doc-utils.spec
index 52c124b..60faa42 100644
--- a/gnome-doc-utils.spec
+++ b/gnome-doc-utils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package gnome-doc-utils
 #
-# Copyright (c) 2013 SUSE LINUX Products 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,9 +20,9 @@ Name:           gnome-doc-utils
 Version:        0.20.10
 Release:        0
 Summary:        A Collection of Documentation Utilities for GNOME
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          System/GUI/GNOME
-Url:            http://www.gnome.org
+URL:            http://www.gnome.org
 Source:         http://download.gnome.org/sources/gnome-doc-utils/0.20/%{name}-%{version}.tar.xz
 # PATCH-FIX-UPSTREAM gnome-doc-utils-fig-path.patch bgo#682776 dimstar@opensuse.org -- Fix linking of figs in subfolders.
 Patch0:         gnome-doc-utils-fig-path.patch
@@ -33,11 +33,10 @@ BuildRequires:  libxml2-python
 # needed for xmllint
 BuildRequires:  libxml2-tools
 BuildRequires:  libxslt-devel
-BuildRequires:  pkg-config
+BuildRequires:  pkgconfig
 BuildRequires:  translation-update-upstream
 Requires:       libxslt
 Recommends:     %{name}-lang
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
 %description
@@ -49,7 +48,7 @@ Yelp.
 
 %package -n xml2po
 Summary:        Tool to extract translatable content from XML documents
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          System/GUI/GNOME
 Requires:       libxml2-python
 
@@ -60,7 +59,7 @@ POT files.
 
 %package devel
 Summary:        A Collection of Documentation Utilities for GNOME
-License:        GPL-2.0+ and LGPL-2.1+
+License:        GPL-2.0-or-later AND LGPL-2.1-or-later
 Group:          System/GUI/GNOME
 Requires:       %{name} = %{version}
 # For the validation with xsltproc to use a local DTD
@@ -76,7 +75,7 @@ Yelp.
 
 %package -n xml2po-devel
 Summary:        Tool to extract translatable content from XML documents
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          System/GUI/GNOME
 Requires:       xml2po = %{version}
 
@@ -86,6 +85,7 @@ content from free-form XML documents and outputs gettext compatible
 POT files.
 
 %lang_package
+
 %prep
 %setup -q
 %patch0 -p1
@@ -94,24 +94,21 @@ translation-update-upstream
 %build
 %configure\
 	--disable-scrollkeeper
-make %{?jobs:-j%jobs} pkgconfigdir=%{_datadir}/pkgconfig
+make %{?_smp_mflags} pkgconfigdir=%{_datadir}/pkgconfig
 
 %install
-%makeinstall pkgconfigdir=%{_datadir}/pkgconfig
+%make_install pkgconfigdir=%{_datadir}/pkgconfig
 %if 0%{?suse_version} <= 1120
-%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
+rm %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
 %endif
 %find_lang %{name} %{?no_lang_C}
 %find_lang gnome-doc-make %{?no_lang_C} %{name}.lang
 %find_lang gnome-doc-xslt %{?no_lang_C} %{name}.lang
 %fdupes %{buildroot}
 
-%clean
-rm -rf %{buildroot}
-
 %files
-%defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog NEWS README
+%license COPYING
+%doc AUTHORS ChangeLog NEWS README
 %dir %{_datadir}/gnome/
 %dir %{_datadir}/gnome/help/
 %dir %{_datadir}/gnome/help/gnome-doc-make/
@@ -126,14 +123,13 @@ rm -rf %{buildroot}
 %{_datadir}/xml/mallard
 
 %files -n xml2po
-%defattr (-, root, root)
-%doc xml2po/AUTHORS xml2po/ChangeLog xml2po/COPYING xml2po/NEWS xml2po/README
+%license xml2po/COPYING
+%doc xml2po/AUTHORS xml2po/ChangeLog xml2po/NEWS xml2po/README
 %{_bindir}/xml2po
 %{python_sitelib}/xml2po
-%{_mandir}/man?/xml2po.*
+%{_mandir}/man?/xml2po*%{ext_man}
 
 %files devel
-%defattr (-, root, root)
 %{_bindir}/gnome-doc-prepare
 %dir %{_datadir}/aclocal
 %{_datadir}/aclocal/gnome-doc-utils.m4
@@ -143,7 +139,6 @@ rm -rf %{buildroot}
 %{_datadir}/gnome-doc-utils/template*.*
 
 %files -n xml2po-devel
-%defattr (-, root, root)
 %{_datadir}/pkgconfig/xml2po.pc
 
 %files lang -f %{name}.lang