From 41cd33dc63ec9fcb833ac5b0693269711b46f70b7c41dba1d39b33a5b2725e98 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 14 May 2012 14:14:33 +0000 Subject: [PATCH] Accepting request 120880 from devel:libraries:c_c++ - Update to new upstream release 20120514 * add statparse.pl (parse numbers from /proc/X/stat) * printcaps: support new capabilities as of Linux 3.2 * sysinfo: avoid counting disks multiple times * googtts: automatically split long text into multiple HTTP reqs OBS-URL: https://build.opensuse.org/request/show/120880 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hxtools?expand=0&rev=13 --- 7a4b085-capabilities.diff | 32 -------------------------------- hxtools-20120107.tar.xz | 3 --- hxtools-20120107.tar.xz.asc | 17 ----------------- hxtools-20120514.tar.xz | 3 +++ hxtools-20120514.tar.xz.asc | 17 +++++++++++++++++ hxtools.changes | 9 +++++++++ hxtools.spec | 31 ++++++++++++++++++++----------- 7 files changed, 49 insertions(+), 63 deletions(-) delete mode 100644 7a4b085-capabilities.diff delete mode 100644 hxtools-20120107.tar.xz delete mode 100644 hxtools-20120107.tar.xz.asc create mode 100644 hxtools-20120514.tar.xz create mode 100644 hxtools-20120514.tar.xz.asc diff --git a/7a4b085-capabilities.diff b/7a4b085-capabilities.diff deleted file mode 100644 index a54959b..0000000 --- a/7a4b085-capabilities.diff +++ /dev/null @@ -1,32 +0,0 @@ -parent e688e5c6d8a9b0032db2218ab71766f11c19d2ca (rel-20120107-4-ge688e5c) -commit 7a4b085d13182f690b1bbdc971401251b6be09a2 -Author: Jan Engelhardt -Date: Sat Feb 11 02:13:39 2012 +0100 - -printcaps: guard against non-existing capability defines ---- - sadmin/printcaps.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -diff --git a/sadmin/printcaps.c b/sadmin/printcaps.c -index bb957e3..bd14d6c 100644 ---- a/sadmin/printcaps.c -+++ b/sadmin/printcaps.c -@@ -47,9 +47,15 @@ static const char *const cap_names[] = { - E(LEASE), - E(AUDIT_WRITE), - E(AUDIT_CONTROL), -+#ifdef CAP_SETFCAP - E(SETFCAP), -+#endif -+#ifdef CAP_MAC_OVERRIDE - E(MAC_OVERRIDE), -+#endif -+#ifdef CAP_MAC_ADMIN - E(MAC_ADMIN), -+#endif - #undef E - }; - --- -# Created with git-export-patch diff --git a/hxtools-20120107.tar.xz b/hxtools-20120107.tar.xz deleted file mode 100644 index e912b35..0000000 --- a/hxtools-20120107.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aeb4a860049ebdcc23eafe15f48f8f254a4a1ec18342911b6e8f12ccfef2f1d1 -size 272460 diff --git a/hxtools-20120107.tar.xz.asc b/hxtools-20120107.tar.xz.asc deleted file mode 100644 index 3610f34..0000000 --- a/hxtools-20120107.tar.xz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) - -iQIcBAABAgAGBQJPB5k2AAoJEN//LNsZ/DONS0gP+wccSet66gG++FoqvX721KAK -APYOAiPpmTlXFRkCBsuFykwOU4lZMNQQjhGbopAfzQnQu1RYWon9S6TzuOoX3dH9 -+eYBtFdgPvKnKtIMLix5RiGfYgRiiKFN0oS0pcysqpCaUksaS8abL0stFfgSqVWX -EqGfl27NFkEXEG3RdeoN5P9zzxOipsMRsHalGCBPh5nOjNzXy2xmvwdk0n21ZQK8 -PSFjio6c9Q6+P+6pJsaU8PrpGfoZD1HOkTl+CoXpfxWNpDPEkKqS8PM2rQjQUcMy -Dq/dTCzO3xIuXmThUGX1zauJZEN7HLHXh6d6jE6ohOtLTWnSxMLpu/hDCR+49yaE -uaAhuis9zq2d+LegJ7LT0e6fR5v2iW3d+VsDVdqMYP523slYXR2c58+A5LabprTz -ZUQz1SC3g+jg6xpa2g0sbBPqoxH2v6Pj/B8f0WdmACh1edETXL+o0rPZLl5NYPxS -4LHsw2E4j4U4ZaZ7APjftz2Ut3oDlpGjTOBR3eNZor/Wa6RK7o0rgUXoXP/nyWBR -UsMRvuEJLaFICl65BQfyqDhCB0GhuQvZBbbn9CrdZmd3Xul4YXhNCObEBOqV7kRQ -3XUQCy3Lhd1uWtapGaXmbsLO+/VKrVqEC0W5PsVy8+txBZm5tNWEx259b+bkagh7 -gBoQ2Oqfbs4IF1klxz/N -=xnEu ------END PGP SIGNATURE----- diff --git a/hxtools-20120514.tar.xz b/hxtools-20120514.tar.xz new file mode 100644 index 0000000..142e99a --- /dev/null +++ b/hxtools-20120514.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d04cf63a6f4eb42071ebf4af735cc20d6cf48c582e90a14a462e1d0f3e0926c +size 276788 diff --git a/hxtools-20120514.tar.xz.asc b/hxtools-20120514.tar.xz.asc new file mode 100644 index 0000000..8736720 --- /dev/null +++ b/hxtools-20120514.tar.xz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.18 (GNU/Linux) + +iQIcBAABAgAGBQJPsMDMAAoJEN//LNsZ/DON7k8QAKVNQQvZ6Vt2MPItH+J4tMyz +dOMzQZa8ChSzLYhVMkXWkt/CYQEnuthQxk85vewkg7utCTwARCnqaU6P8LhWs3NQ +cFa7+qhDfsFnXU94DYupou4uLAAWnlLFE6G6vyXC7+Fuo3Eprcc/5Yfxzs4Ncqzu +Itu75NR1rZeU3zXAEn3liw+pASg/40b6I4WYgqQ65Rjf+RsiNeiudnrM8tEAN6dq +98qfifwrSzlMHtmNUCAAE0qXwle/5PkDBYQyS2sqM1G0YTf92cBB351QdM9T1GDG +BJMcbCGYaCWhiio9JMatIsqOjcqsscWRFYrGlm3Hop0KN2FNOyj0hN5W9+Th7JkN +xVic5hAJ0rRbOzfOjl9BgmT7gy7q5b9F351DygNUXNmC49wYXzMinAmw9RwKlfIN +foGdMNnB/kTINHVDk/9w46uuIbq+9wA6H0sKqpcyMC3zL40PLOmlDYuRYzavGixw +E9Egib3Z4t5DOto66XwZGD4HmNbyP8MRH+zlwFSN1T+GamLSogSFQfw6qJIMJadQ +im35ByAPUhORnPhaFpXokkwsvj3tpvd7J9ZGCAGW+H7AKa032fP87JCHlRMNoMS1 +LCULxP7VVdZjMpsKCIedRTjb5Lp70dAMWVXjMfL4UO85cz6rGmJJUjfLFLOdmwvI +wdKfozqtRf1fXaHcbcEk +=9xFi +-----END PGP SIGNATURE----- diff --git a/hxtools.changes b/hxtools.changes index 3216418..eed74f5 100644 --- a/hxtools.changes +++ b/hxtools.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon May 14 08:32:41 UTC 2012 - jengelh@inai.de + +- Update to new upstream release 20120514 +* add statparse.pl (parse numbers from /proc/X/stat) +* printcaps: support new capabilities as of Linux 3.2 +* sysinfo: avoid counting disks multiple times +* googtts: automatically split long text into multiple HTTP reqs + ------------------------------------------------------------------- Mon Mar 12 11:27:33 UTC 2012 - cfarrell@suse.com diff --git a/hxtools.spec b/hxtools.spec index e12ac36..3d7fcc9 100644 --- a/hxtools.spec +++ b/hxtools.spec @@ -15,32 +15,37 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: hxtools -Version: 20120107 +Version: 20120514 Release: 0 -Url: http://jengelh.medozas.de/projects/hxtools/ +Url: http://inai.de/projects/hxtools/ Summary: Collection of day-to-day tools (binaries) License: GPL-2.0+ Group: System/Base Source: %name-%version.tar.xz Source2: %name-%version.tar.xz.asc -Patch1: 7a4b085-capabilities.diff BuildRequires: fdupes BuildRequires: libcap-devel >= 2 # xorg-x11 for "bdftopcf" -%if 0%{?suse_version} -BuildRequires: xorg-x11 -%endif -%if 0%{?rhel_version} || 0%{?fedora_version} +%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} >= 1130 BuildRequires: pkgconfig(libHX) >= 3.12 +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 @@ -60,6 +65,7 @@ A collection of various tools. Some of the important ones: * fd0ssh(1) — pipe for password-over-stdin support to ssh * newns(8) — clone current filesystem namespace and start a process * ofl(1) — open file lister (replaces fuser and lsof -m) +* sysinfo(1) — system configuration summary * tailhex(1) — hex dumper with tail-following support * utmp_register(1) — make entries in the utmp/wtmp database * vfontas(1) — VGA font file assembler @@ -76,9 +82,12 @@ Recommends: %name-man %else Requires: %name-man %endif -Requires: perl(Data::Dumper), perl(File::Find) +Requires: perl(Data::Dumper) +Requires: perl(File::Find) Requires: perl(File::Find::Rule) -Requires: perl(Getopt::Long), perl(IPC::Open2), perl(Text::CSV_XS) +Requires: perl(Getopt::Long) +Requires: perl(IPC::Open2) +Requires: perl(Text::CSV_XS) %description scripts Architecture-independent programs from hxtools. @@ -133,8 +142,9 @@ Architecture-independent data from hxtools. %package profile Summary: The hxtools shell environment Group: System/Base -Requires: %name = %version, %name-scripts = %version +Requires: %name = %version Requires: %name-data = %version +Requires: %name-scripts = %version %if 0%{?suse_version} >= 1120 BuildArch: noarch %endif @@ -151,7 +161,6 @@ only important parts of a path. tar -xf "%{S:0}" --use=xz; %setup -DTq %endif -%patch -P 1 -p1 %build %configure \