From d4ca5bcfe5410d6cf8ed0a1287e8b207bc41e64703afb2c084b4613168b171eb Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Thu, 24 Sep 2020 13:38:48 +0000
Subject: [PATCH] Accepting request 836561 from
 home:jengelh:branches:X11:Utilities

- Upgrade old RPM constructs.

OBS-URL: https://build.opensuse.org/request/show/836561
OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/x11-tools?expand=0&rev=46
---
 x11-tools.changes |  5 +++++
 x11-tools.spec    | 47 +++++++++++++++++++----------------------------
 2 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/x11-tools.changes b/x11-tools.changes
index 9e137c0..3ca0a64 100644
--- a/x11-tools.changes
+++ b/x11-tools.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Sep 24 12:51:44 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
+
+- Upgrade old RPM constructs.
+
 -------------------------------------------------------------------
 Wed Sep 23 16:28:35 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
 
diff --git a/x11-tools.spec b/x11-tools.spec
index f66a002..a31e30e 100644
--- a/x11-tools.spec
+++ b/x11-tools.spec
@@ -22,7 +22,7 @@
 %endif
 
 Name:           x11-tools
-PreReq:         %fillup_prereq
+Requires(post): %fillup_prereq
 Provides:       3ddiag
 Provides:       xf86tools
 Obsoletes:      3ddiag
@@ -41,50 +41,41 @@ Source35:       nvidia-pre-install
 Source36:       nvidia-post-uninstall
 Source37:       i18n.template
 BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 Some useful tools for the X Window System.
 
-
-
-Authors:
---------
-    Stefan Dirsch <sndirsch@suse.de>
-    Ludwig Nussel <lnussel@suse.de>
-
 %prep
 
 %build
 
 %install
-mkdir -p $RPM_BUILD_ROOT/usr/bin/
-install -m 755 $RPM_SOURCE_DIR/xf86debug      $RPM_BUILD_ROOT/usr/bin
+mkdir -p %{buildroot}/usr/bin/
+install -m 755 %{_sourcedir}/xf86debug      %{buildroot}/usr/bin
 %if 0%{?suse_version} >= 1550
-mkdir -p $RPM_BUILD_ROOT/%{_distconfdir}/X11/xim.d
-install -m 644 $RPM_SOURCE_DIR/xim  $RPM_BUILD_ROOT/%{_distconfdir}/X11
-install -m 644 $RPM_SOURCE_DIR/none $RPM_BUILD_ROOT/%{_distconfdir}/X11/xim.d
+mkdir -p %{buildroot}/%{_distconfdir}/X11/xim.d
+install -m 644 %{_sourcedir}/xim  %{buildroot}/%{_distconfdir}/X11
+install -m 644 %{_sourcedir}/none %{buildroot}/%{_distconfdir}/X11/xim.d
 %else
-mkdir -p $RPM_BUILD_ROOT/etc/X11/xim.d
-install -m 644 $RPM_SOURCE_DIR/xim  $RPM_BUILD_ROOT/etc/X11
-install -m 644 $RPM_SOURCE_DIR/none $RPM_BUILD_ROOT/etc/X11/xim.d
+mkdir -p %{buildroot}/etc/X11/xim.d
+install -m 644 %{_sourcedir}/xim  %{buildroot}/etc/X11
+install -m 644 %{_sourcedir}/none %{buildroot}/etc/X11/xim.d
 %endif
-mkdir -p $RPM_BUILD_ROOT/etc/skel
-install -m 644 $RPM_SOURCE_DIR/xim.template $RPM_BUILD_ROOT/etc/skel/.xim.template
-install -m 644 %{S:37} $RPM_BUILD_ROOT/etc/skel/.i18n
-mkdir -p  $RPM_BUILD_ROOT%{_fillupdir}/
-install -c -m 644 $RPM_SOURCE_DIR/sysconfig.language-%{name} $RPM_BUILD_ROOT%{_fillupdir}/
-mkdir -p $RPM_BUILD_ROOT/usr/lib/nvidia
-install -m 755 $RPM_SOURCE_DIR/nvidia-pre-install \
-  $RPM_BUILD_ROOT/usr/lib/nvidia/pre-install
-install -m 755 $RPM_SOURCE_DIR/nvidia-post-uninstall \
-  $RPM_BUILD_ROOT/usr/lib/nvidia/post-uninstall
+mkdir -p %{buildroot}/etc/skel
+install -m 644 %{_sourcedir}/xim.template %{buildroot}/etc/skel/.xim.template
+install -m 644 %{S:37} %{buildroot}/etc/skel/.i18n
+mkdir -p  %{buildroot}/%{_fillupdir}/
+install -c -m 644 %{_sourcedir}/sysconfig.language-%{name} %{buildroot}/%{_fillupdir}/
+mkdir -p %{buildroot}/usr/lib/nvidia
+install -m 755 %{_sourcedir}/nvidia-pre-install \
+  %{buildroot}/usr/lib/nvidia/pre-install
+install -m 755 %{_sourcedir}/nvidia-post-uninstall \
+  %{buildroot}/usr/lib/nvidia/post-uninstall
 
 %post
 %{fillup_only -an language}
 
 %files
-%defattr(-, root, root)
 %dir /usr/lib/nvidia
 /usr/bin/xf86debug
 /usr/lib/nvidia/pre-install