From 7521314a9115a73509d2500794a86edc72b64533b6ed525ddac6fcaf60f70800 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Thu, 28 Jul 2011 06:45:57 +0000 Subject: [PATCH] Accepting request 77300 from devel:libraries:c_c++ - Update to hxtools-20110721 * all: include libHX_CFLAGS to avoid build abort due to missing -I * ofl: define _GNU_SOURCE to avoid build abort - Update to hxtools-20110509 * phased out and/or removed obsolete scripts - Update dependencies on Perl modules OBS-URL: https://build.opensuse.org/request/show/77300 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hxtools?expand=0&rev=6 --- hxtools-20110214.tar.xz | 3 --- hxtools-20110214.tar.xz.asc | 7 ------- hxtools-20110721.tar.xz | 3 +++ hxtools-20110721.tar.xz.asc | 7 +++++++ hxtools.changes | 14 ++++++++++++++ hxtools.spec | 28 ++++++++++++---------------- 6 files changed, 36 insertions(+), 26 deletions(-) delete mode 100644 hxtools-20110214.tar.xz delete mode 100644 hxtools-20110214.tar.xz.asc create mode 100644 hxtools-20110721.tar.xz create mode 100644 hxtools-20110721.tar.xz.asc diff --git a/hxtools-20110214.tar.xz b/hxtools-20110214.tar.xz deleted file mode 100644 index d3127bf..0000000 --- a/hxtools-20110214.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6bf835991d83d3019c7c629973445ea2170393d7934d9cf4680a5019577b782d -size 268752 diff --git a/hxtools-20110214.tar.xz.asc b/hxtools-20110214.tar.xz.asc deleted file mode 100644 index a86bf1a..0000000 --- a/hxtools-20110214.tar.xz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) - -iEYEABECAAYFAk1ZoWYACgkQ92gFgoRMQ2C6KACfc7QwABu9JUvW0h8ujB6BLBDM -wzAAnAqMTTvC5I420dnyJcXZ8AfIo314 -=afIn ------END PGP SIGNATURE----- diff --git a/hxtools-20110721.tar.xz b/hxtools-20110721.tar.xz new file mode 100644 index 0000000..b079ecd --- /dev/null +++ b/hxtools-20110721.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5f5642c75f94b207fa32088bdf73429a6b447af2a81b139d977435fbb2c32eed +size 270020 diff --git a/hxtools-20110721.tar.xz.asc b/hxtools-20110721.tar.xz.asc new file mode 100644 index 0000000..612b7e8 --- /dev/null +++ b/hxtools-20110721.tar.xz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.16 (GNU/Linux) + +iF4EABEIAAYFAk4oO80ACgkQkb3j62iiDkWNpgD/SK7lXN3/J7oV+qiQ8JI2z6Uu ++OjJQ6jD53NoLWqomUIA/3vGRX/4nNomEPyFMKmwPFCIBh1kiNYDCpWAEYNzixWl +=Zf96 +-----END PGP SIGNATURE----- diff --git a/hxtools.changes b/hxtools.changes index 3b09f37..a3c6b3a 100644 --- a/hxtools.changes +++ b/hxtools.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Thu Jul 21 14:52:09 UTC 2011 - jengelh@medozas.de + +- Update to hxtools-20110721 +* all: include libHX_CFLAGS to avoid build abort due to missing -I +* ofl: define _GNU_SOURCE to avoid build abort + +------------------------------------------------------------------- +Sat May 21 09:48:32 UTC 2011 - jengelh@medozas.de + +- Update to hxtools-20110509 +* phased out and/or removed obsolete scripts +- Update dependencies on Perl modules + ------------------------------------------------------------------- Mon Feb 14 15:49:03 UTC 2011 - jengelh@medozas.de diff --git a/hxtools.spec b/hxtools.spec index 66a39a2..f84298f 100644 --- a/hxtools.spec +++ b/hxtools.spec @@ -16,21 +16,23 @@ # - Name: hxtools -Version: 20110214 +Version: 20110721 Release: 1 Group: System/Base -Url: http://jengelh.medozas.de/projects/hxtools/ +URL: http://jengelh.medozas.de/projects/hxtools/ Summary: Collection of day-to-day tools (binaries) Source: %name-%version.tar.xz Source2: %name-%version.tar.xz.asc License: GPL,PD # freetype2, xorg-x11 for "bdftopcf" -BuildRequires: freetype2 libHX-devel >= 3.4 libcap-devel -BuildRequires: pkg-config xorg-x11 xz -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: freetype2, libHX-devel >= 3.4, libcap-devel +BuildRequires: pkg-config, xorg-x11, xz +BuildRoot: %_tmppath/%name-%version-build +Requires: perl(Data::Dumper), perl(File::Find) +Requires: perl(File::Find::Rule) +Requires: perl(Getopt::Long), perl(IPC::Open2), perl(Text::CSV_XS) Recommends: %name-scripts = %version, %name-man = %version %define build_profile 1 @@ -47,7 +49,6 @@ A collection of various tools. Some of the important ones: * vfontas(1) — VGA font file assembler %package scripts -License: GPL,PD Group: System/Base Summary: Collection of day-to-day tools (scripts) BuildArch: noarch @@ -79,7 +80,6 @@ Architecture-independent programs from hxtools. * wktimer(1) — work timer %package man -License: GPL,PD Group: Documentation/Man Summary: Manual pages for the hxtools suite BuildArch: noarch @@ -89,7 +89,6 @@ This package contains the manual pages for the binaries and scripts from hxtools. %package data -License: GPL,PD Group: System/Base Summary: Collection of day-to-day tools (data) BuildArch: noarch @@ -102,7 +101,6 @@ Architecture-independent data from hxtools. * additional syntax highlighting definitions for mcedit %package profile -License: GPL,PD Group: System/Base Summary: The hxtools shell environment Requires: %name = %version, %name-scripts = %version @@ -128,8 +126,6 @@ make %{?_smp_mflags}; %install o="$PWD"; b="%buildroot"; -rm -Rf "$b"; -mkdir "$b"; make install DESTDIR="$b"; install -dm0755 "$b/%_datadir/mc/syntax"; @@ -144,15 +140,14 @@ find ./%_bindir ./%_libexecdir ! -type d -exec grep -L ELF {} + | \ perl -pe 's{^\./+}{/}' >"$o/scripts.lst"; %if 0%{?build_profile} +mkdir -p "$b/%_sysconfdir/bashrc.d"; +ln -s "%_datadir/%name/hxtools_bashrc.bash" "$b/%_sysconfdir/bashrc.d/"; mkdir -p "$b/%_sysconfdir/profile.d"; ln -s "%_datadir/%name/hxtools_profile.bash" "$b/%_sysconfdir/profile.d/z_hxtools_profile.sh"; %else rm -Rf "$b/%_sysconfdir/profile.d" "$b/%_sysconfdir"/hx*; %endif -%clean -rm -Rf "%buildroot"; - %files -f binary.lst %defattr(-,root,root) %dir %_libexecdir/%name @@ -176,10 +171,11 @@ rm -Rf "%buildroot"; %_datadir/mc %if 0%{?build_profile} - %files profile %defattr(-,root,root) %config %_sysconfdir/hxloginpref.conf +%dir %_sysconfdir/bashrc.d +%config %_sysconfdir/bashrc.d/* %config %_sysconfdir/profile.d/* %endif