From 67b0275337871c801ce57bf08d9068feecbfa92dba9a146323c4df3263cb83ee Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Sat, 17 Apr 2021 18:10:24 +0000
Subject: [PATCH] Accepting request 886335 from home:dirkmueller:Factory

- modernize spec-file (move license to licensedir)

OBS-URL: https://build.opensuse.org/request/show/886335
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xmodmap?expand=0&rev=16
---
 xmodmap.changes |  5 +++++
 xmodmap.spec    | 16 +++++++---------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/xmodmap.changes b/xmodmap.changes
index 86162c8..6788ada 100644
--- a/xmodmap.changes
+++ b/xmodmap.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Apr 17 16:39:15 UTC 2021 - Dirk Müller <dmueller@suse.com>
+
+- modernize spec-file (move license to licensedir) 
+
 -------------------------------------------------------------------
 Wed Sep  9 15:57:08 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
 
diff --git a/xmodmap.spec b/xmodmap.spec
index da39fc4..44a9669 100644
--- a/xmodmap.spec
+++ b/xmodmap.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package xmodmap
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,24 +19,22 @@
 %if 0%{?suse_version} >= 1550
 %define UsrEtcMove 1
 %endif
-
 Name:           xmodmap
 Version:        1.0.10
 Release:        0
 Summary:        Utility to modify keymaps and pointer button mappings in X
 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
 Source1:        Xmodmap.template
 Source2:        Xmodmap.remote.template
-BuildRequires:  pkg-config
+BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(x11)
 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 xmodmap program is used to edit and display the keyboard modifier
@@ -50,7 +48,7 @@ tastes.
 
 %build
 %configure
-make %{?_smp_mflags}
+%make_build
 
 %install
 %make_install
@@ -63,8 +61,8 @@ install -m0644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/X11/Xmodmap.remote
 %endif
 
 %files
-%defattr(-,root,root)
-%doc AUTHORS ChangeLog COPYING README.md
+%license COPYING
+%doc AUTHORS ChangeLog README.md
 %if 0%{?UsrEtcMove}
 %dir %{_distconfdir}/X11
 %{_distconfdir}/X11/Xmodmap