pool/xorg-x11-fonts
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1040922 from home:dimstar:Factory

Browse Source 
- 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
This commit is contained in:
Antonio Larrosa 2022-12-09 08:04:54 +00:00 committed by Git OBS Bridge
parent d83f27fb1c
commit 032044d8ad
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xorg-x11-fonts.changes
View File

@ -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> Tue Jul 12 22:29:12 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>

9
xorg-x11-fonts.spec
View File

@ -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 to truetype format in the xorg-x11-fonts-converted package
%prep %prep
%setup -n . -T -D %setup -T -D -c
%if "%{flavor}" != "converted" %if "%{flavor}" != "converted"
rm -rf $RPM_BUILD_DIR/*
for i in $RPM_SOURCE_DIR/*.tar.{bz2,xz}; do tar xf $i; done for i in $RPM_SOURCE_DIR/*.tar.{bz2,xz}; do tar xf $i; done
%else %else
cp %{SOURCE100} . 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}" make -C $dir install DESTDIR=$RPM_BUILD_ROOT "${option}"
done done
rm -f $RPM_BUILD_ROOT/usr/share/fonts/*/fonts.cache* rm -f $RPM_BUILD_ROOT/usr/share/fonts/*/fonts.cache*
pushd $RPM_BUILD_ROOT 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' | \
find usr/share/fonts/75dpi -type f -iname \*.pcf.gz | sed 's+^usr+/usr+g' | \ grep -v -e ISO8859 >> files.%{name}-core
grep -v -e ISO8859 >> $RPM_BUILD_DIR/files.%{name}-core
popd
rm -rf $RPM_BUILD_ROOT/usr/etc rm -rf $RPM_BUILD_ROOT/usr/etc
rm -f $RPM_BUILD_ROOT/fonts.{dir,scale} rm -f $RPM_BUILD_ROOT/fonts.{dir,scale}
rm -f $RPM_BUILD_ROOT/usr/share/fonts/encodings/{,large}/encodings.dir rm -f $RPM_BUILD_ROOT/usr/share/fonts/encodings/{,large}/encodings.dir