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
This commit is contained in:
Stefan Dirsch 2021-04-17 18:10:24 +00:00 committed by Git OBS Bridge
parent 2926575e9e
commit 67b0275337
2 changed files with 12 additions and 9 deletions

View File

@ -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> Wed Sep 9 15:57:08 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package xmodmap # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -19,24 +19,22 @@
%if 0%{?suse_version} >= 1550 %if 0%{?suse_version} >= 1550
%define UsrEtcMove 1 %define UsrEtcMove 1
%endif %endif
Name: xmodmap Name: xmodmap
Version: 1.0.10 Version: 1.0.10
Release: 0 Release: 0
Summary: Utility to modify keymaps and pointer button mappings in X Summary: Utility to modify keymaps and pointer button mappings in X
License: MIT License: MIT
Group: System/X11/Utilities Group: System/X11/Utilities
URL: http://xorg.freedesktop.org/ URL: https://xorg.freedesktop.org/
Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2 Source0: https://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2
Source1: Xmodmap.template Source1: Xmodmap.template
Source2: Xmodmap.remote.template Source2: Xmodmap.remote.template
BuildRequires: pkg-config BuildRequires: pkgconfig
BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xorg-macros) >= 1.8 BuildRequires: pkgconfig(xorg-macros) >= 1.8
BuildRequires: pkgconfig(xproto) >= 7.0.17 BuildRequires: pkgconfig(xproto) >= 7.0.17
# This was part of the xorg-x11 package up to version 7.6 # This was part of the xorg-x11 package up to version 7.6
Conflicts: xorg-x11 <= 7.6 Conflicts: xorg-x11 <= 7.6
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
The xmodmap program is used to edit and display the keyboard modifier The xmodmap program is used to edit and display the keyboard modifier
@ -50,7 +48,7 @@ tastes.
%build %build
%configure %configure
make %{?_smp_mflags} %make_build
%install %install
%make_install %make_install
@ -63,8 +61,8 @@ install -m0644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/X11/Xmodmap.remote
%endif %endif
%files %files
%defattr(-,root,root) %license COPYING
%doc AUTHORS ChangeLog COPYING README.md %doc AUTHORS ChangeLog README.md
%if 0%{?UsrEtcMove} %if 0%{?UsrEtcMove}
%dir %{_distconfdir}/X11 %dir %{_distconfdir}/X11
%{_distconfdir}/X11/Xmodmap %{_distconfdir}/X11/Xmodmap