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

Accepting request 1249318 from X11:XOrg

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1249318
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-fonts?expand=0&rev=60
This commit is contained in:
Ana Guerrero 2025-03-03 15:04:29 +00:00 committed by Git OBS Bridge
commit d61dda054d
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xorg-x11-fonts.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Feb 27 21:45:25 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
- Trim old specfile constructs
- Ensure build recipe is POSIX sh compatible
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Mar 3 03:25:43 UTC 2024 - Stefan Dirsch <sndirsch@suse.com> Sun Mar 3 03:25:43 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>

34
xorg-x11-fonts.spec
View File

@ -1,7 +1,7 @@
# #
# spec file # spec file for package xorg-x11-fonts
# #
# Copyright (c) 2024 SUSE LLC # Copyright (c) 2025 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
@ -29,7 +29,6 @@ URL: http://xorg.freedesktop.org/
Version: 7.6 Version: 7.6
Release: 0 Release: 0
BuildArch: noarch BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: X.Org fonts Summary: X.Org fonts
License: MIT License: MIT
Group: System/X11/Fonts Group: System/X11/Fonts
@ -140,18 +139,18 @@ to truetype format in the xorg-x11-fonts-converted package
%prep %prep
%setup -T -D -c %setup -T -D -c
%if "%{flavor}" != "converted" %if "%{flavor}" != "converted"
for i in $RPM_SOURCE_DIR/*.tar.xz; do tar xf $i; done for i in %{_sourcedir}/*.tar.xz; do tar -xf "$i"; done
%else %else
cp %{SOURCE100} . cp %{SOURCE100} .
tar xf %{SOURCE0} tar -xf %{SOURCE0}
tar xf %{SOURCE1} tar -xf %{SOURCE1}
%endif %endif
%build %build
%if "%{flavor}" != "converted" %if "%{flavor}" != "converted"
echo -e '#!/bin/sh\nexec /usr/bin/gzip -n -9 "$@"' > ../gzip ; chmod a+x ../gzip ; PATH=`pwd`/..:$PATH echo -e '#!/bin/sh\nexec /usr/bin/gzip -n -9 "$@"' > ../gzip ; chmod a+x ../gzip ; PATH=`pwd`/..:$PATH
for dir in encodings-* $(ls | grep -v -e encodings -e alias) font-alias-* ; do for dir in encodings-* $(ls | grep -v -e encodings -e alias) font-alias-* ; do
pushd $dir cd "$dir"
case $dir in case $dir in
*alias-*) option="--with-fontrootdir=/usr/share/fonts" ;; *alias-*) option="--with-fontrootdir=/usr/share/fonts" ;;
*encodings-*) option="--with-encodingsdir=/usr/share/fonts/encodings" ;; *encodings-*) option="--with-encodingsdir=/usr/share/fonts/encodings" ;;
@ -166,10 +165,10 @@ for dir in encodings-* $(ls | grep -v -e encodings -e alias) font-alias-* ; do
*) option="" ;; *) option="" ;;
esac esac
#autoreconf -fi #autoreconf -fi
./configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ ./configure CFLAGS="%{optflags} -fno-strict-aliasing" \
--prefix=/usr --libdir=%{_libdir} \ --prefix=/usr --libdir=%{_libdir} \
--mandir=%{_mandir} ${option} --mandir=%{_mandir} ${option}
popd cd -
done done
%else %else
@ -250,14 +249,14 @@ for dir in encodings-* $(ls | grep -v -e encodings -e alias) font-alias-* ; do
*misc-cyrillic-*) option='FONT_FILES=koi12x24b koi12x24 koi6x13b koi7x14b koi8x16b koi8x16 koi9x15b koi9x18b';; *misc-cyrillic-*) option='FONT_FILES=koi12x24b koi12x24 koi6x13b koi7x14b koi8x16b koi8x16 koi9x15b koi9x18b';;
*) option='NOOPT=' ;; *) option='NOOPT=' ;;
esac esac
make -C $dir install DESTDIR=$RPM_BUILD_ROOT "${option}" make -C $dir install DESTDIR="%{buildroot}" "${option}"
done done
rm -f $RPM_BUILD_ROOT/usr/share/fonts/*/fonts.cache* rm -f %{buildroot}/usr/share/fonts/*/fonts.cache*
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 %{buildroot}/usr/share/fonts/75dpi -type f -iname \*.pcf.gz | sed -e "s+%{buildroot}++g" -e 's+^usr+/usr+g' | \
grep -v -e ISO8859 >> files.%{name}-core grep -v -e ISO8859 >> files.%{name}-core
rm -rf $RPM_BUILD_ROOT/usr/etc rm -rf %{buildroot}/usr/etc
rm -f $RPM_BUILD_ROOT/fonts.{dir,scale} rm -f %{buildroot}/fonts.{dir,scale}
rm -f $RPM_BUILD_ROOT/usr/share/fonts/encodings/{,large}/encodings.dir rm -f %{buildroot}/usr/share/fonts/encodings/{,large}/encodings.dir
%else %else
# "%%{flavor}" == "converted" # "%%{flavor}" == "converted"
@ -298,8 +297,6 @@ cp font-adobe*/*.otb %{buildroot}/%{_datadir}/fonts/truetype/
%endif %endif
%clean %clean
rm -rf "$RPM_BUILD_ROOT"
# %%post scriptlets # %%post scriptlets
%reconfigure_fonts_scriptlets %reconfigure_fonts_scriptlets
@ -308,7 +305,6 @@ rm -rf "$RPM_BUILD_ROOT"
%reconfigure_fonts_scriptlets -n xorg-x11-fonts-legacy %reconfigure_fonts_scriptlets -n xorg-x11-fonts-legacy
%files %files
%defattr(-,root,root)
%dir /usr/share/fonts/Type1 %dir /usr/share/fonts/Type1
%dir /usr/share/fonts/cyrillic %dir /usr/share/fonts/cyrillic
%dir /usr/share/fonts/truetype %dir /usr/share/fonts/truetype
@ -330,7 +326,6 @@ rm -rf "$RPM_BUILD_ROOT"
/usr/share/fonts/truetype/*.ttf /usr/share/fonts/truetype/*.ttf
%files core %files core
%defattr(-,root,root)
%dir /usr/share/fonts/misc %dir /usr/share/fonts/misc
%dir /usr/share/fonts/encodings %dir /usr/share/fonts/encodings
%dir /usr/share/fonts/encodings/large %dir /usr/share/fonts/encodings/large
@ -373,7 +368,6 @@ rm -rf "$RPM_BUILD_ROOT"
# "%%{flavor}" == "converted" # "%%{flavor}" == "converted"
%files %files
%defattr(-,root,root)
%doc README.converted %doc README.converted
%dir %{_datadir}/fonts/truetype %dir %{_datadir}/fonts/truetype
%{_datadir}/fonts/truetype/CharterBT-*.ttf %{_datadir}/fonts/truetype/CharterBT-*.ttf