diff --git a/font-util-remove-font-mapdir.patch b/font-util-remove-font-mapdir.patch new file mode 100644 index 0000000000000000000000000000000000000000..3d9a953ed6b1bf25fe0a9f9cfb077bd38502eaee --- /dev/null +++ b/font-util-remove-font-mapdir.patch @@ -0,0 +1,11 @@ +--- font-util-1.4.1/fontutil.pc.in.orig 2024-12-05 09:49:52.959732212 +0800 ++++ font-util-1.4.1/fontutil.pc.in 2024-12-05 09:50:02.246866689 +0800 +@@ -4,7 +4,7 @@ + datarootdir=@datarootdir@ + datadir=@datadir@ + fontrootdir=@fontrootdir@ +-mapdir=@MAPDIR@ ++mapdir= + + Name: FontUtil + Description: Font utilities dirs diff --git a/xorg-x11-font-utils.spec b/xorg-x11-font-utils.spec index 194ca40ce0a6f851c1ddd3606a8c5c13f692a8b7..a96f39fa7cbfe0b06e6ea84671a8af30eccc5e00 100644 --- a/xorg-x11-font-utils.spec +++ b/xorg-x11-font-utils.spec @@ -1,23 +1,32 @@ +%bcond_without ucs2any + %global _x11fontdir %{_datadir}/X11/fonts Summary: X.Org X11 font utilities Name: xorg-x11-font-utils Epoch: 2 Version: 1.4.1 -Release: 1 +Release: 2 +%if %{with ucs2any} License: MIT AND BSD-2-Clause AND MIT-open-group AND Unicode-TOU +%else +License: MIT AND BSD-2-Clause AND MIT-open-group +%endif URL: https://www.x.org Source0: https://www.x.org/releases/individual/font/font-util-%{version}.tar.xz Source5: xorg-x11-fonts-update-dirs Source6: xorg-x11-fonts-update-dirs.1 +Patch0: font-util-remove-font-mapdir.patch BuildRequires: gcc make BuildRequires: pkgconfig(xorg-macros) >= 1.8 -Provides: font-utils = %{epoch}:%{version}-%{release} -Obsoletes: font-utils < %{epoch}:%{version}-%{release} +Provides: font-util = %{epoch}:%{version}-%{release} +Obsoletes: font-util < %{epoch}:%{version}-%{release} +%if %{with ucs2any} Provides: ucs2any = %{epoch}:%{version}-%{release} Obsoletes: ucs2any < %{epoch}:%{version}-%{release} +%endif %description X.Org X11 font utilities required for font installation, conversion, and generation. @@ -25,7 +34,10 @@ X.Org X11 font utilities required for font installation, conversion, and generat %package_help %prep -%autosetup -p1 -n font-util-%{version} +%setup -q -n font-util-%{version} +%if %{without ucs2any} +%patch -P0 -p1 +%endif %build %configure --with-fontrootdir=%{_x11fontdir} @@ -34,6 +46,12 @@ X.Org X11 font utilities required for font installation, conversion, and generat %install %make_install +%if %{without ucs2any} +pushd %{buildroot} +rm -frv %{_bindir}/ucs2any %{_x11fontdir} %{_mandir}/man1/ucs2any.1* +popd +%endif + install -m 744 -D %{S:5} %{buildroot}%{_bindir}/xorg-x11-fonts-update-dirs sed -i "s:@DATADIR@:%{_datadir}:" %{buildroot}%{_bindir}/xorg-x11-fonts-update-dirs @@ -46,19 +64,26 @@ rm -f %{buildroot}%{_mandir}/man1/bdftruncate.1 %files %doc README.md %license COPYING -%{_bindir}/ucs2any %{_bindir}/xorg-x11-fonts-update-dirs %{_datadir}/aclocal/fontutil.m4 %{_libdir}/pkgconfig/fontutil.pc +%if %{with ucs2any} +%{_bindir}/ucs2any %dir %{_x11fontdir} %dir %{_x11fontdir}/util %{_x11fontdir}/util/map-* +%endif %files help +%if %{with ucs2any} %{_mandir}/man1/ucs2any.1* +%endif %{_mandir}/man1/xorg-x11-fonts-update-dirs.1* %changelog +* Wed Dec 04 2024 Funda Wang - 2:1.4.1-2 +- build ucs2any conditioned due to license + * Tue Aug 20 2024 Funda Wang - 2:1.4.1-1 - update to 1.4.1 - deaggregation of xorg-x11-*