Merged update from upstream sources
This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/xorg-x11-font-utils.git#57fcf192d186afacffe2a40b47a3b660c3a97a49
This commit is contained in:
DistroBaker
parent
2cb66cc6ac
commit
d020cfbbf2
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,5 +1 @@
|
||||
fonttosfnt-*.tar.bz2
|
||||
bdftopcf-*.tar.bz2
|
||||
mkfontscale-*.tar.bz2
|
||||
mkfontdir-*.tar.bz2
|
||||
font-util-*.tar.bz2
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/mkfontscale.c b/mkfontscale.c
|
||||
index a67f283..96e19a3 100644
|
||||
--- a/mkfontscale.c
|
||||
+++ b/mkfontscale.c
|
||||
@@ -317,7 +317,7 @@ getName(FT_Face face, int nid)
|
||||
int i;
|
||||
|
||||
if(getNameHelper(face, nid,
|
||||
- TT_PLATFORM_MICROSOFT, TT_MS_ID_UNICODE_CS, &name) ||
|
||||
+ TT_PLATFORM_MICROSOFT, -1, &name) ||
|
||||
getNameHelper(face, nid,
|
||||
TT_PLATFORM_APPLE_UNICODE, -1, &name)) {
|
||||
string = malloc(name.string_len / 2 + 1);
|
||||
4
sources
4
sources
@ -1,5 +1 @@
|
||||
SHA512 (bdftopcf-1.1.tar.bz2) = 7b790e8d512ca2812ac889c156ef91c48798b4744a6857e5b17e0128764b5afa8c5426fe5de05a9819d64745116718db4221b3e657e3c2633465e87179c44bec
|
||||
SHA512 (font-util-1.3.1.tar.bz2) = 9fd6dd4c0a01ede5f0b09ec0f9d316267ca086e2ee9526a43a4e4d6ce3cd67c977293bd3cf440328ca417292fcae1579888b24b7259eaf012230890210d74889
|
||||
SHA512 (mkfontdir-1.0.7.tar.bz2) = 96d1920565514f90621e18a87fb5a2db9e052d1bffc6552d9659e065a21e252ab98b4e62013755032b98ed6d8c3381eb75c3c8e02651766ee4791ca622dcef1f
|
||||
SHA512 (mkfontscale-1.1.3.tar.bz2) = 509e2f9cd55cf87cc3968c8767bf3f2386016278db8b7be75b7df34bf61f52519dd2778f3b9881ffbe30cc2fe26089c0a5b2c33af46bc7727f46dad83f030a62
|
||||
SHA512 (fonttosfnt-1.2.1.tar.bz2) = 3d4ece61e31d4a5ed56923ecc1883e80a9308d2062d37345cb5be081bc2b004aadebf99a989601749a63e03eb641e0522d07773a57bca0b4710ed453e4f20742
|
||||
|
||||
@ -1,7 +1,3 @@
|
||||
%global bdftopcf 1.1
|
||||
%global fonttosfnt 1.2.1
|
||||
%global mkfontdir 1.0.7
|
||||
%global mkfontscale 1.1.3
|
||||
%global font_util 1.3.1
|
||||
|
||||
# Must be kept in sync with xorg-x11-fonts!
|
||||
@ -11,85 +7,41 @@ Summary: X.Org X11 font utilities
|
||||
Name: xorg-x11-font-utils
|
||||
Epoch: 1
|
||||
Version: 7.5
|
||||
Release: 49%{?dist}
|
||||
Release: 51%{?dist}
|
||||
License: MIT
|
||||
URL: http://www.x.org
|
||||
|
||||
Source0: http://www.x.org/pub/individual/app/bdftopcf-%{bdftopcf}.tar.bz2
|
||||
Source1: http://www.x.org/pub/individual/app/fonttosfnt-%{fonttosfnt}.tar.bz2
|
||||
Source2: http://www.x.org/pub/individual/app/mkfontdir-%{mkfontdir}.tar.bz2
|
||||
Source3: http://www.x.org/pub/individual/app/mkfontscale-%{mkfontscale}.tar.bz2
|
||||
Source4: http://www.x.org/pub/individual/font/font-util-%{font_util}.tar.bz2
|
||||
Source0: http://www.x.org/pub/individual/font/font-util-%{font_util}.tar.bz2
|
||||
# helper script used in post for xorg-x11-fonts
|
||||
Source5: xorg-x11-fonts-update-dirs
|
||||
Source6: xorg-x11-fonts-update-dirs.1
|
||||
|
||||
Patch0: mkfontscale-examine-all-encodings.patch
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: libtool
|
||||
BuildRequires: pkgconfig(fontenc)
|
||||
BuildRequires: pkgconfig(freetype2)
|
||||
BuildRequires: pkgconfig(x11)
|
||||
BuildRequires: gcc make libtool
|
||||
BuildRequires: pkgconfig(xorg-macros) >= 1.8
|
||||
BuildRequires: zlib-devel
|
||||
|
||||
# Ensure that freetype is installed before this is when in the same transaction
|
||||
OrderWithRequires: freetype
|
||||
|
||||
Provides: bdftopcf = %{bdftopcf}
|
||||
Provides: fonttosfnt = %{fonttosfnt}
|
||||
Provides: mkfontdir = %{mkfontdir}
|
||||
Provides: mkfontscale = %{mkfontscale}
|
||||
Provides: font-util = %{font_util}
|
||||
|
||||
Provides: font-utils = %{epoch}:%{version}-%{release}
|
||||
Provides: ucs2any = %{font_util}
|
||||
|
||||
Obsoletes: bdftopcf < 1.1-1
|
||||
Obsoletes: fonttosfnt < 1.2.1-1
|
||||
Obsoletes: mkfontdir < 1.2.1-1
|
||||
Obsoletes: mkfontscale < 1.2.1-1
|
||||
|
||||
%description
|
||||
X.Org X11 font utilities required for font installation, conversion, and
|
||||
generation.
|
||||
|
||||
%prep
|
||||
%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4
|
||||
pushd mkfontscale-*
|
||||
%patch0 -p1 -b .all-encodings
|
||||
popd
|
||||
%autosetup -n font-util-%{font_util}
|
||||
|
||||
%build
|
||||
# Build all apps
|
||||
{
|
||||
for app in * ; do
|
||||
pushd $app
|
||||
autoreconf -vif
|
||||
case $app in
|
||||
font-util-*)
|
||||
%configure --with-fontrootdir=%{_x11fontdir}
|
||||
;;
|
||||
*)
|
||||
%configure
|
||||
;;
|
||||
esac
|
||||
make %{?_smp_mflags}
|
||||
popd
|
||||
done
|
||||
}
|
||||
%configure --with-fontrootdir=%{_x11fontdir}
|
||||
%make_build
|
||||
|
||||
%install
|
||||
# Install all apps
|
||||
{
|
||||
for app in * ; do
|
||||
pushd $app
|
||||
%make_install
|
||||
popd
|
||||
done
|
||||
for i in */README ; do
|
||||
[ -s $i ] && cp $i README-$(echo $i | sed 's/-[0-9].*//')
|
||||
done
|
||||
for i in */COPYING ; do
|
||||
grep -q stub $i || cp $i COPYING-$(echo $i | sed 's/-[0-9].*//')
|
||||
done
|
||||
}
|
||||
%make_install
|
||||
|
||||
install -m 744 %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/xorg-x11-fonts-update-dirs
|
||||
sed -i "s:@DATADIR@:%{_datadir}:" $RPM_BUILD_ROOT%{_bindir}/xorg-x11-fonts-update-dirs
|
||||
@ -99,20 +51,12 @@ install -m 744 -p -D %{SOURCE6} $RPM_BUILD_ROOT%{_mandir}/man1/xorg-x11-fonts-up
|
||||
find $RPM_BUILD_ROOT -name bdftruncate\* -print0 | xargs -0 rm -f
|
||||
|
||||
%files
|
||||
%doc README-*
|
||||
%license COPYING-bdftopcf COPYING-[c-z]*
|
||||
%{_bindir}/bdftopcf
|
||||
%{_bindir}/fonttosfnt
|
||||
%{_bindir}/mkfontdir
|
||||
%{_bindir}/mkfontscale
|
||||
%doc README
|
||||
%license COPYING
|
||||
%{_bindir}/ucs2any
|
||||
%{_bindir}/xorg-x11-fonts-update-dirs
|
||||
%{_datadir}/aclocal/fontutil.m4
|
||||
%{_libdir}/pkgconfig/fontutil.pc
|
||||
%{_mandir}/man1/bdftopcf.1*
|
||||
%{_mandir}/man1/fonttosfnt.1*
|
||||
%{_mandir}/man1/mkfontdir.1*
|
||||
%{_mandir}/man1/mkfontscale.1*
|
||||
%{_mandir}/man1/ucs2any.1*
|
||||
%{_mandir}/man1/xorg-x11-fonts-update-dirs.1*
|
||||
%dir %{_x11fontdir}
|
||||
@ -120,6 +64,13 @@ find $RPM_BUILD_ROOT -name bdftruncate\* -print0 | xargs -0 rm -f
|
||||
%{_x11fontdir}/util/map-*
|
||||
|
||||
%changelog
|
||||
* Thu Feb 25 2021 Peter Hutterer <peter.hutterer@redhat.com> 1:7.5-51
|
||||
- Drop bdftopcf, mkfontscale and fonttosfnt, they are in separate packages
|
||||
now (#1932731)
|
||||
|
||||
* Tue Feb 23 2021 Peter Hutterer <peter.hutterer@redhat.com> 1:7.5-50
|
||||
- Update to mkfontscale 1.2.1 which obsoletes the separate mkfontdir.
|
||||
|
||||
* Sun Feb 21 2021 Neal Gompa <ngompa13@gmail.com> - 1:7.5-49
|
||||
- Add OrderWithRequires for freetype to ensure freetype is installed first
|
||||
- Move license files to license tag on file list
|
||||
|
||||
Loading…
Reference in New Issue
Block a user