From d30b6d31a4b8cae4f45e3ae72b2dc56939c5c0e1b9e06bbb224544abab9aafb1 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Tue, 10 Mar 2020 12:15:49 +0000
Subject: [PATCH] - Update to release 20200310

OBS-URL: https://build.opensuse.org/package/show/utilities/hxtools?expand=0&rev=23
---
 hxtools-20200126.tar.asc | 16 ----------------
 hxtools-20200126.tar.xz  |  3 ---
 hxtools-20200310.tar.asc | 16 ++++++++++++++++
 hxtools-20200310.tar.xz  |  3 +++
 hxtools.changes          |  8 ++++++++
 hxtools.spec             | 34 +++++++++++++++++++---------------
 6 files changed, 46 insertions(+), 34 deletions(-)
 delete mode 100644 hxtools-20200126.tar.asc
 delete mode 100644 hxtools-20200126.tar.xz
 create mode 100644 hxtools-20200310.tar.asc
 create mode 100644 hxtools-20200310.tar.xz

diff --git a/hxtools-20200126.tar.asc b/hxtools-20200126.tar.asc
deleted file mode 100644
index 8977b29..0000000
--- a/hxtools-20200126.tar.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEZ6M9qwrMkjBQqThHajkz2il9+30FAl4tpFwACgkQajkz2il9
-+31aHg/+LXL0+3fa8DZUi77Qv2Zv6lc3WTt8dCwe8VVXxP0MygA2AH2Wu8l3Gw30
-4bdVKdoa4FVzXvK8YOlkFTyYu5e8ekFYRZ7uD1P8+kP3w9y90LytgeOkZnkMXxFs
-LsRdMBHBhOaCJtkza4K53ojrY8TctUaEVrHDfDLQjfneFf38xJHsQOeQpUjXB8R4
-ukJ2Sk4i/r0wql75Noutf+mXXKm3+voMytQ14YEJidNjdP/tm57P8wb7mkd3vo8p
-AEryjqKDPkobvJopDurS1j0o6fBJSLNOHHj0iBXjPOY47ZwxrZNDCefRmfjg/05b
-PLfaXgkf8aNW8T3oP3wcDTudcjh+MCf6Q6NhjCz5ZOTP316pUkqJ+7JG+Z2jCMn6
-SlMoHHks0dBQhrCFLe2FlDA67vozGKHVnXOMYxuCzZlZM7mdwu5GBbhkO2jZlDxP
-4SWvX8MMiwCt1lpWYlp5RiocPTM4sPwxlRJ4xZnTMrXpkBO/rmpvSBuLhq1Mmdg9
-gZk7CgMHUiRwDxMYvfASS018pK5IbcoRKr/CRghhxJT1yJFgGLnLxcFLdHe2/QdQ
-bN8UCHO5uM3bwAfj2rupZTXeESH1KtQ9Xz6kjyScWyjyfxXWBsbhX9Wb7t/e3ZQF
-jtBYaAB4wxvst3+wxFFh8wQ1ndnU6nqfGTmO8QjDQY1pzpADLKs=
-=ECWe
------END PGP SIGNATURE-----
diff --git a/hxtools-20200126.tar.xz b/hxtools-20200126.tar.xz
deleted file mode 100644
index 79bd553..0000000
--- a/hxtools-20200126.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8602f4c1d94ea04b874a6124c24dafe75eb49a5946c81e7e011859ce186bb4b8
-size 210016
diff --git a/hxtools-20200310.tar.asc b/hxtools-20200310.tar.asc
new file mode 100644
index 0000000..c44ff5b
--- /dev/null
+++ b/hxtools-20200310.tar.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEZ6M9qwrMkjBQqThHajkz2il9+30FAl5nZgsACgkQajkz2il9
++33fkw/8Drc3I+m2thxTypF5DXpIL/j2sWiaPpHxG9kSUG2YG6V7KdxQMExxRomU
+sxebm292yLY6Pg5b4hBXnRpTIJaAnAzxnigJywa82EeLhhnUQCWR5CA0xtXm9JmW
+wlZHqz13APPWv6zOpRBgS4MGNY3XQR7TB1LP3j7x+RusliL7ZyuERzp9JKpY234d
+Dpf9LbArIUd/r/jDaV2ARQfuP8VuSK5yID6cJ3lKTR41/bNxleSFyCQJpGcI2aj3
+JM5huV+KAwWTxcUJc5SNZdbqFs+NNB3wv/8oFLkzmNDOf6twqow5Yz1calt8Psnx
+x9A3kwoD/DRnqpN45XSJfU4FrPb8ijI9L5deCVrVmo7TXRDAu1yM8WzxghplI6Fe
+3r6MvOSXdjj6dmXLCVJK+mC2i/M9wbUQwinIplD2na4KUrG0AmlEOqi6GtOzGgfy
+Elp7RYS6pMDimktbUVYGvtkahgTqntjySrJqqLPrVTvsrN5Rxy+Bsn6Rxnq/5wGH
+sugaT+dxZzGchoXwLb3yuwUILAmaHlaxzdXwIhMBC3hEbtaf/ebU7fombJfQ/dC/
+BL+u7dmjDFR5KXvoohsobk5P0Vy906UfrsDHZTblsWxoU1alMzocMXrxcR1Xz2Gz
+kHnjxl+R8L64ZQoYmkP3dD4mT+ymos5KAIb07/kU51ouimHSsN4=
+=LcF6
+-----END PGP SIGNATURE-----
diff --git a/hxtools-20200310.tar.xz b/hxtools-20200310.tar.xz
new file mode 100644
index 0000000..5ba3108
--- /dev/null
+++ b/hxtools-20200310.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:decc956314742a6f1deaacea27f10cb1830adfc3c6df1bb065bc8141b29b12aa
+size 202180
diff --git a/hxtools.changes b/hxtools.changes
index 622f8aa..0b82086 100644
--- a/hxtools.changes
+++ b/hxtools.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Mar 10 12:15:27 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 20200310
+  * vfontas: add new N1 vectorizer
+  * vfontas: new -saven1 command to use N1
+  * vfontas: remove -xbrz scaler
+
 -------------------------------------------------------------------
 Sun Jan 26 14:39:46 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
 
diff --git a/hxtools.spec b/hxtools.spec
index dd6483b..689cd87 100644
--- a/hxtools.spec
+++ b/hxtools.spec
@@ -17,7 +17,7 @@
 
 
 Name:           hxtools
-Version:        20200126
+Version:        20200310
 Release:        0
 Summary:        Collection of day-to-day tools (binaries)
 License:        GPL-2.0+ and WTFPL
@@ -37,7 +37,6 @@ BuildRequires:  pkgconfig(libHX) >= 3.17
 BuildRequires:  pkgconfig(libpci) >= 3
 BuildRequires:  pkgconfig(mount) >= 2.20
 BuildRequires:  pkgconfig(xcb) >= 1
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       %name-scripts = %version
 Recommends:     %name-man = %version
 Recommends:     hardlink
@@ -51,12 +50,9 @@ Requires:       sysinfo = %version
 %description
 A collection of various tools. Some of the important ones:
 
-* declone(1) — break hardlinks
 * fd0ssh(1) — pipe for password-over-stdin support to ssh
 * ofl(1) — open file lister (replaces fuser and lsof -m)
 * tailhex(1) — hex dumper with tail-following support
-* utmp_register(1) — make entries in the utmp/wtmp database
-* vfontas(1) — Bitmap font transformation utility
 
 %package scripts
 Summary:        Collection of day-to-day tools (scripts)
@@ -156,6 +152,16 @@ directories or files in specific locations in use. It differs from
 lsof/fuser in that it can scan recursively and won't bluntly look at
 an entire mount.
 
+%package -n vfontas
+Summary:        Bitmap font file transformation utility
+Group:          System/Console
+Provides:       hxtools:/usr/bin/vfontas
+
+%description -n vfontas
+vfontas (originally "VGA font file assembler") can transform raster
+font files in various ways - scaling, moving, row-filling, convert
+between formats (bdf/clt/pbm/psf/raw) and vector export to sfd/ttf.
+
 %prep
 %setup -q
 
@@ -169,7 +175,6 @@ b="%buildroot"
 mv "$b/%_bindir"/extract_* "$b/%_libexecdir/%name/"
 mv "$b/%_bindir/rot13" "$b/%_libexecdir/%name/"
 install -dm0755 "$b/%_datadir/mc/syntax"
-install -pm0644 cooledit/*.syntax "$b/%_datadir/mc/syntax/"
 install -dm0755 "$b/%_sysconfdir/openldap/schema"
 ln -s "%_datadir/hxtools/rfc2307bis-utf8.schema" \
 	"$b/%_sysconfdir/openldap/schema/"
@@ -186,8 +191,7 @@ rm -Rf "$b/%_sysconfdir/profile.d" "$b/%_sysconfdir"/hx*
 %fdupes %buildroot/%_prefix
 
 %files
-%defattr(-,root,root)
-%doc LICENSE*
+%license LICENSE*
 %_bindir/bin2c
 %_bindir/bsvplay
 %_bindir/declone
@@ -198,7 +202,6 @@ rm -Rf "$b/%_sysconfdir/profile.d" "$b/%_sysconfdir"/hx*
 %_bindir/proc_stat_parse
 %_bindir/qplay
 %_bindir/tailhex
-%_bindir/vfontas
 %_bindir/xcp
 %dir %hldir
 %hldir/cctypeinfo
@@ -208,7 +211,6 @@ rm -Rf "$b/%_sysconfdir/profile.d" "$b/%_sysconfdir"/hx*
 %hldir/utmp_register
 
 %files scripts
-%defattr(-,root,root)
 %_bindir/aumeta
 %_bindir/checkbrack
 %_bindir/cwdiff
@@ -240,13 +242,13 @@ rm -Rf "$b/%_sysconfdir/profile.d" "$b/%_sysconfdir"/hx*
 %hldir/vcsaview
 
 %files man
-%defattr(-,root,root)
 %doc %_mandir/man*/*
 %exclude %_mandir/man*/fd0ssh.1*
 %exclude %_mandir/man*/ofl.1*
+%exclude %_mandir/man1/sysinfo.1*
+%exclude %_mandir/man*/vfontas.1*
 
 %files data
-%defattr(-,root,root)
 %dir %_sysconfdir/openldap
 %dir %_sysconfdir/openldap/schema
 %config %_sysconfdir/openldap/schema/*
@@ -257,7 +259,6 @@ rm -Rf "$b/%_sysconfdir/profile.d" "$b/%_sysconfdir"/hx*
 %if 0%{?build_profile}
 
 %files profile
-%defattr(-,root,root)
 %config %_sysconfdir/hxloginpref.conf
 %dir %_sysconfdir/bashrc.d
 %config %_sysconfdir/bashrc.d/*
@@ -265,13 +266,11 @@ rm -Rf "$b/%_sysconfdir/profile.d" "$b/%_sysconfdir"/hx*
 %endif
 
 %files -n fd0ssh
-%defattr(-,root,root)
 %dir %hldir
 %hldir/fd0ssh
 %_mandir/man1/fd0ssh.1*
 
 %files -n ofl
-%defattr(-,root,root)
 %_bindir/ofl
 %_mandir/man1/ofl.1*
 
@@ -279,10 +278,15 @@ rm -Rf "$b/%_sysconfdir/profile.d" "$b/%_sysconfdir"/hx*
 %defattr(-,root,root)
 %_bindir/pmap_dirty
 %_bindir/sysinfo
+%_mandir/man1/sysinfo.1*
 %dir %hldir
 %hldir/clock_info
 %hldir/hxnetload
 %hldir/paddrspacesize
 %hldir/proc_stat_signal_decode
 
+%files -n vfontas
+%_bindir/vfontas
+%_mandir/man1/vfontas.1*
+
 %changelog