From 20b1c38527670c55738acfd0e7c4b3a2b851f68c94a975671f92edc836479344 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Sun, 2 May 2021 20:43:14 +0000
Subject: [PATCH] Accepting request 889729 from home:dirkmueller:Factory

- modernize spec file (move license to licensedir)

OBS-URL: https://build.opensuse.org/request/show/889729
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xkbcomp?expand=0&rev=29
---
 xkbcomp.changes |  5 +++++
 xkbcomp.spec    | 14 ++++++--------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/xkbcomp.changes b/xkbcomp.changes
index 5e9236d..725a680 100644
--- a/xkbcomp.changes
+++ b/xkbcomp.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat May  1 18:27:33 UTC 2021 - Dirk Müller <dmueller@suse.com>
+
+- modernize spec file (move license to licensedir) 
+
 -------------------------------------------------------------------
 Wed Mar 17 10:33:45 UTC 2021 - Stefan Dirsch <sndirsch@suse.com>
 
diff --git a/xkbcomp.spec b/xkbcomp.spec
index 97a5b10..1903e72 100644
--- a/xkbcomp.spec
+++ b/xkbcomp.spec
@@ -22,17 +22,16 @@ Release:        0
 Summary:        Utility to compile XKB keyboard description
 License:        MIT
 Group:          System/X11/Utilities
-URL:            http://xorg.freedesktop.org/
-Source0:        http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2
+URL:            https://xorg.freedesktop.org/
+Source0:        https://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2
 BuildRequires:  bison
-BuildRequires:  pkg-config
+BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xkbfile)
 BuildRequires:  pkgconfig(xorg-macros) >= 1.8
 BuildRequires:  pkgconfig(xproto) >= 7.0.17
 # This was part of the xorg-x11 package up to version 7.6
 Conflicts:      xorg-x11 <= 7.6
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 The xkbcomp keymap compiler converts a description of an XKB keymap
@@ -52,19 +51,18 @@ into one of several output formats.
 
 %build
 %configure
-make %{?_smp_mflags} V=1
+%make_build
 
 %install
 %make_install
 
 %files
-%defattr(-,root,root)
-%doc ChangeLog COPYING README
+%license COPYING
+%doc ChangeLog README
 %{_bindir}/xkbcomp
 %{_mandir}/man1/xkbcomp.1%{?ext_man}
 
 %files devel
-%defattr(-,root,root)
 %{_libdir}/pkgconfig/xkbcomp.pc
 
 %changelog