From eec9ead8b83fd3e5e485d4a918fb4eb26c2481d475e6fe5f1715417cb348a61f Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Tue, 25 Mar 2014 18:42:23 +0000
Subject: [PATCH] hxtools-20140325

OBS-URL: https://build.opensuse.org/package/show/utilities/hxtools?expand=0&rev=6
---
 hxtools-20131222.tar.asc |  7 -------
 hxtools-20131222.tar.xz  |  3 ---
 hxtools-20140325.tar.asc |  7 +++++++
 hxtools-20140325.tar.xz  |  3 +++
 hxtools.changes          |  8 ++++++++
 hxtools.spec             | 42 ++--------------------------------------
 6 files changed, 20 insertions(+), 50 deletions(-)
 delete mode 100644 hxtools-20131222.tar.asc
 delete mode 100644 hxtools-20131222.tar.xz
 create mode 100644 hxtools-20140325.tar.asc
 create mode 100644 hxtools-20140325.tar.xz

diff --git a/hxtools-20131222.tar.asc b/hxtools-20131222.tar.asc
deleted file mode 100644
index 5327588..0000000
--- a/hxtools-20131222.tar.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iF4EABEIAAYFAlK3Lm8ACgkQkb3j62iiDkUnvAD8Dk1hyP3SPiafTEOl03EZKDJC
-UWd2tyU7sFFlyCHmrRsA/2JRmDKVZIqIiqSVtxfJ7xNcBvSETCqw47hCaZeihOzR
-=Sooi
------END PGP SIGNATURE-----
diff --git a/hxtools-20131222.tar.xz b/hxtools-20131222.tar.xz
deleted file mode 100644
index 465e06f..0000000
--- a/hxtools-20131222.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fe9b497a4c9be3149db629aeace8af071f65223b3533ffe75b534e5b6b39b961
-size 294220
diff --git a/hxtools-20140325.tar.asc b/hxtools-20140325.tar.asc
new file mode 100644
index 0000000..0968c42
--- /dev/null
+++ b/hxtools-20140325.tar.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iF4EABEIAAYFAlMxzZkACgkQkb3j62iiDkU0ewEAhUK6DZN5jtuzFQvPjqLe8wVc
+enAeBsbQ+MkhyfyGNd4A/0eL2pPa9u6xvxOIfgZH+lCpnSJUgdNbp50gI/1dONMx
+=MWB0
+-----END PGP SIGNATURE-----
diff --git a/hxtools-20140325.tar.xz b/hxtools-20140325.tar.xz
new file mode 100644
index 0000000..4ebc7c7
--- /dev/null
+++ b/hxtools-20140325.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a66a197a437c23e78cddffcfaf07e6bada56736b6ba1766c3b4333e29ba2a589
+size 295220
diff --git a/hxtools.changes b/hxtools.changes
index ce2c205..b2176e6 100644
--- a/hxtools.changes
+++ b/hxtools.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Mar 25 18:41:41 UTC 2014 - jengelh@inai.de
+
+- Update to new upstream release 20140325
+* bin2c now supports the -p option to strip paths
+* bin2c also defaults to stripping all leading paths
+- Drop support for old distros in .spec file
+
 -------------------------------------------------------------------
 Wed Feb 12 09:11:44 UTC 2014 - idonmez@suse.com
 
diff --git a/hxtools.spec b/hxtools.spec
index a18098a..f1f9a9f 100644
--- a/hxtools.spec
+++ b/hxtools.spec
@@ -17,7 +17,7 @@
 
 
 Name:           hxtools
-Version:        20131222
+Version:        20140325
 Release:        0
 Summary:        Collection of day-to-day tools (binaries)
 License:        GPL-2.0+ and WTFPL
@@ -31,36 +31,17 @@ Source3:        %name.keyring
 # See https://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 BuildRequires:  fdupes
 BuildRequires:  libcap-devel >= 2
-# xorg-x11 for "bdftopcf"
-%if 0%{?suse_version} >= 1220 || 0%{?rhel_version} || 0%{?fedora_version}
 BuildRequires:  bdftopcf
-%else
-BuildRequires:  xorg-x11
-%endif
 BuildRequires:  pkgconfig >= 0.21
 BuildRequires:  xz
-%if 0%{?suse_version} >= 1230
-BuildRequires:  gpg-offline
-%endif
-%if 0%{?suse_version} >= 1130
-BuildRequires:  pkgconfig(libHX) >= 3.12
+BuildRequires:  pkgconfig(libHX) >= 3.17
 BuildRequires:  pkgconfig(libpci) >= 3
 BuildRequires:  pkgconfig(mount) >= 2.20
 BuildRequires:  pkgconfig(xcb) >= 1
-%else
-BuildRequires:  libHX-devel >= 3.12
-BuildRequires:  libmount-devel >= 2.20
-BuildRequires:  libxcb-devel >= 1
-BuildRequires:  pciutils-devel >= 3
-%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 Requires:       %name-scripts = %version
-%if 0%{?suse_version} >= 1100
 Recommends:     %name-man = %version
-%else
-Requires:       %name-man = %version
-%endif
 Requires:       fd0ssh
 Requires:       ofl
 Requires:       sysinfo = %version
@@ -82,15 +63,9 @@ A collection of various tools. Some of the important ones:
 %package scripts
 Summary:        Collection of day-to-day tools (scripts)
 Group:          Productivity/Other
-%if 0%{?suse_version} >= 1120
 BuildArch:      noarch
-%endif
 Requires:       %name
-%if 0%{?suse_version} >= 1100
 Recommends:     %name-man
-%else
-Requires:       %name-man
-%endif
 Requires:       perl(Data::Dumper)
 Requires:       perl(File::Find)
 Requires:       perl(File::Find::Rule)
@@ -124,9 +99,7 @@ Architecture-independent programs from hxtools.
 %package man
 Summary:        Manual pages for the hxtools suite
 Group:          Documentation/Man
-%if 0%{?suse_version} >= 1120
 BuildArch:      noarch
-%endif
 
 %description man
 This package contains the manual pages for the binaries and scripts
@@ -135,9 +108,7 @@ from hxtools.
 %package data
 Summary:        Collection of day-to-day tools (data)
 Group:          Productivity/Other
-%if 0%{?suse_version} >= 1120
 BuildArch:      noarch
-%endif
 
 %description data
 Architecture-independent data from hxtools.
@@ -152,9 +123,7 @@ Group:          Productivity/Other
 Requires:       %name = %version
 Requires:       %name-data = %version
 Requires:       %name-scripts = %version
-%if 0%{?suse_version} >= 1120
 BuildArch:      noarch
-%endif
 
 %description profile
 Bash environment settings from hxtools. Particularly, this provides
@@ -192,14 +161,7 @@ lsof/fuser in that it can scan recursively and won't bluntly look at
 an entire mount.
 
 %prep
-xz -dk "%{S:0}"
-%{?gpg_verify: %gpg_verify %{S:2}}
-%if 0%{?__xz:1}
 %setup -q
-%else
-tar -xf "%{S:0}" --use=xz;
-%setup -DTq
-%endif
 
 %build
 %configure