rpms/xorg-x11-font-utils
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove pushd/popd (#664699, #664701)

Browse Source
This commit is contained in:
Matěj Cepl 2010-12-22 13:16:40 +01:00
parent 44c9143d57
commit cc451c92a8
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
xorg-x11-font-utils.spec
View File

@ -53,15 +53,17 @@ populated fonts.
%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4
#patch0 -p0 -b .font-util-mapdir-use-datadir-fix #patch0 -p0 -b .font-util-mapdir-use-datadir-fix
#patch1 -p0 -b .autoconf-add-with-fontdir-option #patch1 -p0 -b .autoconf-add-with-fontdir-option
pushd mkfontscale-%{mkfontscale} oldpwd=$(pwd)
cd mkfontscale-%{mkfontscale}
%patch2 -p1 -b .all-encodings %patch2 -p1 -b .all-encodings
popd cd ${oldpwd}
%build %build
# Build all apps # Build all apps
{ {
for app in bdftopcf fonttosfnt mkfontdir mkfontscale font-util ; do for app in bdftopcf fonttosfnt mkfontdir mkfontscale font-util ; do
pushd $app-* oldpwd=$(pwd)
cd $app-*
# FIXME: We run autoconf to activate font-util-0.99.1-mapdir-use-datadir-fix.patch # FIXME: We run autoconf to activate font-util-0.99.1-mapdir-use-datadir-fix.patch
case $app in case $app in
font-util) font-util)
@ -71,7 +73,7 @@ popd
# this --with-mapdir should be redundant? # this --with-mapdir should be redundant?
%configure --with-mapdir=%{_datadir}/X11/fonts/util %configure --with-mapdir=%{_datadir}/X11/fonts/util
make make
popd cd ${oldpwd}
done done
} }
@ -80,16 +82,17 @@ rm -rf $RPM_BUILD_ROOT
# Install all apps # Install all apps
{ {
for app in bdftopcf fonttosfnt mkfontdir mkfontscale font-util; do for app in bdftopcf fonttosfnt mkfontdir mkfontscale font-util; do
pushd $app-* oldpwd=$(pwd)
make install DESTDIR=$RPM_BUILD_ROOT cd $app-*
popd make install DESTDIR=$RPM_BUILD_ROOT
done cd ${oldpwd}
for i in */README ; do done
[ -s $i ] && cp $i README-$(echo $i | sed 's/-[0-9].*//') for i in */README ; do
done [ -s $i ] && cp $i README-$(echo $i | sed 's/-[0-9].*//')
for i in */COPYING ; do done
grep -q stub $i || cp $i COPYING-$(echo $i | sed 's/-[0-9].*//') for i in */COPYING ; do
done grep -q stub $i || cp $i COPYING-$(echo $i | sed 's/-[0-9].*//')
done
# bdftruncate is part of font-util # bdftruncate is part of font-util
cp font-util-*/COPYING COPYING-bdftruncate cp font-util-*/COPYING COPYING-bdftruncate

5
xorg-x11-fonts-update-dirs
View File

@ -51,9 +51,10 @@ fc-cache $fontdir
if ! [ -z "$encodingsdir" ]; then if ! [ -z "$encodingsdir" ]; then
[ -d "$encodingsdir" ] || mkdir -p "$encodingsdir" [ -d "$encodingsdir" ] || mkdir -p "$encodingsdir"
pushd "$encodingsdir" oldpwd=$(pwd)
cd "$encodingsdir"
mkfontscale -n -e "$encodingsdir" -e "$encodingsdir/large" mkfontscale -n -e "$encodingsdir" -e "$encodingsdir/large"
popd cd ${oldpwd}
fi fi