From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Wed, 1 Mar 2023 21:26:02 +0000 (+0100)
Subject: - updated to 1.0.4
X-Git-Tag: auto/th/xorg-font-font-bh-ttf-1.0.4-1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=90c6d4973c37f8be53e4932cad1e82f69cf294fd;p=packages%2Fxorg-font-font-bh-ttf.git

- updated to 1.0.4
---

diff --git a/fontconfig-2.10.patch b/fontconfig-2.10.patch
index 9ff5367..2eaf205 100644
--- a/fontconfig-2.10.patch
+++ b/fontconfig-2.10.patch
@@ -1,6 +1,6 @@
---- font-bh-ttf-1.0.3/Makefile.am~	2010-10-09 01:59:49.000000000 +0200
-+++ font-bh-ttf-1.0.3/Makefile.am	2012-08-09 11:46:35.455350161 +0200
-@@ -37,7 +37,7 @@
+--- font-bh-ttf-1.0.4/Makefile.am.orig	2023-02-28 00:44:32.000000000 +0100
++++ font-bh-ttf-1.0.4/Makefile.am	2023-03-01 22:24:35.120797756 +0100
+@@ -37,7 +37,7 @@ fontdir = @FONTDIR@
  font_DATA = $(FONT_FILES)
  
  actualconfigdir = $(FC_CONFDIR)/conf.d
@@ -8,8 +8,8 @@
 +availconfigdir = $(datadir)/fontconfig/conf.avail
  dist_availconfig_DATA = 42-luxi-mono.conf
  
- EXTRA_DIST = $(FONT_FILES) COPYRIGHT.BH
-@@ -51,7 +51,7 @@
+ EXTRA_DIST = $(FONT_FILES) COPYRIGHT.BH README.md
+@@ -51,7 +51,7 @@ install-data-hook:
  	$(MKFONTDIR) $(DESTDIR)$(fontdir)
  	mkdir -p $(DESTDIR)$(actualconfigdir)
  	@rm -f $(DESTDIR)$(actualconfigdir)/$(dist_availconfig_DATA)
diff --git a/xorg-font-font-bh-ttf.spec b/xorg-font-font-bh-ttf.spec
index e18a38c..57cdcae 100644
--- a/xorg-font-font-bh-ttf.spec
+++ b/xorg-font-font-bh-ttf.spec
@@ -1,21 +1,23 @@
 Summary:	Bigelow & Holmes Luxi font in TrueType format
 Summary(pl.UTF-8):	Font Bigelow & Holmes Luxi w formacie TrueType
 Name:		xorg-font-font-bh-ttf
-Version:	1.0.3
-Release:	3
+Version:	1.0.4
+Release:	1
 License:	distributable if unmodified
 Group:		Fonts
-Source0:	http://xorg.freedesktop.org/releases/individual/font/font-bh-ttf-%{version}.tar.bz2
-# Source0-md5:	e8ca58ea0d3726b94fe9f2c17344be60
+Source0:	https://xorg.freedesktop.org/releases/individual/font/font-bh-ttf-%{version}.tar.xz
+# Source0-md5:	063bfa1456c8a68208bf96a33f472bb1
 Patch0:		fontconfig-2.10.patch
-URL:		http://xorg.freedesktop.org/
-BuildRequires:	autoconf >= 2.57
+URL:		https://xorg.freedesktop.org/
+BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
 BuildRequires:	fontconfig
+BuildRequires:	tar >= 1:1.22
 BuildRequires:	xorg-app-mkfontdir
 BuildRequires:	xorg-app-mkfontscale
 BuildRequires:	xorg-font-font-util >= 1.2
-BuildRequires:	xorg-util-util-macros >= 1.3
+BuildRequires:	xorg-util-util-macros >= 1.20
+BuildRequires:	xz
 Requires(post,postun):	fontpostinst
 Requires:	%{_fontsdir}/TTF
 Requires:	fontconfig >= 1:2.10.1
@@ -37,8 +39,10 @@ Font Bigelow & Holmes Luxi w formacie TrueType.
 %{__autoconf}
 %{__automake}
 %configure \
+%if "%{_gnu}" != "-gnux32"
 	--build=%{_host} \
 	--host=%{_host} \
+%endif
 	--with-fontdir=%{_fontsdir}/TTF
 
 %{__make}
@@ -60,7 +64,7 @@ fontpostinst TTF
 
 %files
 %defattr(644,root,root,755)
-%doc COPYING ChangeLog README
+%doc COPYING ChangeLog README.md
 %{_fontsdir}/TTF/luxi*.ttf
 %{_datadir}/fontconfig/conf.avail/42-luxi-mono.conf
 %config(noreplace,missingok) %verify(not link md5 mtime size) /etc/fonts/conf.d/42-luxi-mono.conf