From 032044d8ade65cd2d4c0030109296577216f5eb34f525f5249ddf25ba1eeb996 Mon Sep 17 00:00:00 2001
From: Antonio Larrosa <alarrosa@suse.com>
Date: Fri, 9 Dec 2022 08:04:54 +0000
Subject: [PATCH] Accepting request 1040922 from home:dimstar:Factory

- Do not ever use "%setup -n .": rpm 4.18 tries to be cleaner and
  remove stuff it extraced, which would lead to 'rm -rf .', which
  rm does not like. Use "%setup -c" instead, which creates the
  appropriate %{name}-%{version} directory expected.

OBS-URL: https://build.opensuse.org/request/show/1040922
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-fonts?expand=0&rev=112
---
 xorg-x11-fonts.changes | 8 ++++++++
 xorg-x11-fonts.spec    | 9 +++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/xorg-x11-fonts.changes b/xorg-x11-fonts.changes
index 6b03e8a..06dd139 100644
--- a/xorg-x11-fonts.changes
+++ b/xorg-x11-fonts.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Dec  7 09:20:52 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Do not ever use "%setup -n .": rpm 4.18 tries to be cleaner and
+  remove stuff it extraced, which would lead to 'rm -rf .', which
+  rm does not like. Use "%setup -c" instead, which creates the
+  appropriate %{name}-%{version} directory expected.
+
 -------------------------------------------------------------------
 Tue Jul 12 22:29:12 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
 
diff --git a/xorg-x11-fonts.spec b/xorg-x11-fonts.spec
index 101642b..472063f 100644
--- a/xorg-x11-fonts.spec
+++ b/xorg-x11-fonts.spec
@@ -138,9 +138,8 @@ This package contains the original Type1 and bitmap fonts that are converted
 to truetype format in the xorg-x11-fonts-converted package
 
 %prep
-%setup -n . -T -D
+%setup -T -D -c
 %if "%{flavor}" != "converted"
-rm -rf $RPM_BUILD_DIR/*
 for i in $RPM_SOURCE_DIR/*.tar.{bz2,xz}; do tar xf $i; done
 %else
 cp %{SOURCE100} .
@@ -254,10 +253,8 @@ for dir in encodings-* $(ls | grep -v -e encodings -e alias) font-alias-* ; do
     make -C $dir install DESTDIR=$RPM_BUILD_ROOT "${option}"
 done
 rm -f $RPM_BUILD_ROOT/usr/share/fonts/*/fonts.cache*
-pushd $RPM_BUILD_ROOT
-find usr/share/fonts/75dpi -type f -iname \*.pcf.gz | sed 's+^usr+/usr+g' | \
-  grep -v -e ISO8859 >> $RPM_BUILD_DIR/files.%{name}-core
-popd
+find $RPM_BUILD_ROOT/usr/share/fonts/75dpi -type f -iname \*.pcf.gz | sed -e "s+$RPM_BUILD_ROOT++g" -e 's+^usr+/usr+g' | \
+  grep -v -e ISO8859 >> files.%{name}-core
 rm -rf $RPM_BUILD_ROOT/usr/etc
 rm -f $RPM_BUILD_ROOT/fonts.{dir,scale}
 rm -f $RPM_BUILD_ROOT/usr/share/fonts/encodings/{,large}/encodings.dir