commit 1fc25b00bac168d60963312e1ee4ce8a7d1a0186
Author: Jakub Bogusz <[email protected]>
Date: Thu Mar 2 20:16:14 2023 +0100
- updated to 1.0.4
xorg-font-font-ibm-type1.spec | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
---
diff --git a/xorg-font-font-ibm-type1.spec b/xorg-font-font-ibm-type1.spec
index 9279703..4b71e87 100644
--- a/xorg-font-font-ibm-type1.spec
+++ b/xorg-font-font-ibm-type1.spec
@@ -1,21 +1,24 @@
Summary: IBM Courier font in Type1 format
Summary(pl.UTF-8): Font IBM Courier w formacie Type1
Name: xorg-font-font-ibm-type1
-Version: 1.0.3
-Release: 2
+Version: 1.0.4
+Release: 1
License: distributable (see COPYING)
Group: Fonts
-Source0:
http://xorg.freedesktop.org/releases/individual/font/font-ibm-type1-%{version}.tar.bz2
-# Source0-md5: bfb2593d2102585f45daa960f43cb3c4
-URL: http://xorg.freedesktop.org/
-BuildRequires: autoconf >= 2.57
+Source0:
https://xorg.freedesktop.org/releases/individual/font/font-ibm-type1-%{version}.tar.xz
+# Source0-md5: 00f64a84b6c9886040241e081347a853
+URL: https://xorg.freedesktop.org/
+BuildRequires: autoconf >= 2.60
BuildRequires: automake
BuildRequires: fontconfig
+BuildRequires: pkgconfig >= 1:0.9.0
BuildRequires: t1utils
+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}/Type1
BuildArch: noarch
@@ -35,8 +38,10 @@ Font IBM Courier w formacie Type1.
%{__autoconf}
%{__automake}
%configure \
+%if "%{_gnu}" != "-gnux32"
--build=%{_host} \
--host=%{_host} \
+%endif
--with-fontdir=%{_fontsdir}/Type1
%{__make}
@@ -50,13 +55,13 @@ rm -rf $RPM_BUILD_ROOT
# separate *.afm, convert *.pfa to .pfb
cd $RPM_BUILD_ROOT%{_fontsdir}/Type1
install -d afm
-mv -f *.afm afm
+%{__mv} *.afm afm
for f in *.pfa ; do
t1binary $f `basename $f .pfa`.pfb
rm -f $f
done
sed -e '1d;s/\.pfa /.pfb /' fonts.scale > fonts.scale.ibm
-rm -f fonts.scale fonts.dir fonts.cache-1
+%{__rm} fonts.scale fonts.dir
cat > Fontmap.ibm <<EOF
/Courier (cour.pfb) ;
@@ -76,7 +81,7 @@ fontpostinst Type1
%files
%defattr(644,root,root,755)
-%doc COPYING ChangeLog README
+%doc COPYING ChangeLog README.md
%{_fontsdir}/Type1/cour*.pfb
%{_fontsdir}/Type1/afm/cour*.afm
%{_fontsdir}/Type1/fonts.scale.ibm
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xorg-font-font-ibm-type1.git/commitdiff/1fc25b00bac168d60963312e1ee4ce8a7d1a0186
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
