Accepting request 61518 from devel:libraries:c_c++

Accepted submit request 61518 from user elvigia

OBS-URL: https://build.opensuse.org/request/show/61518
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hxtools?expand=0&rev=4

hxtools-20101227.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:18069e1746918b0a6135561bd2c927be1a6a00bf8767a9f02f1cc41566a8edfe
-size 268932

hxtools-20101227.tar.xz.asc

@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEABECAAYFAk0YdG4ACgkQ92gFgoRMQ2DwCwCcCknb2coekQ68k2ZnJSd7AW4L
-uHMAn1/0RAQ1C9l1+koJhYbwYcC4+VKx
-=Pu/h
------END PGP SIGNATURE-----

hxtools-20110214.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6bf835991d83d3019c7c629973445ea2170393d7934d9cf4680a5019577b782d
+size 268752

hxtools-20110214.tar.xz.asc

@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEABECAAYFAk1ZoWYACgkQ92gFgoRMQ2C6KACfc7QwABu9JUvW0h8ujB6BLBDM
+wzAAnAqMTTvC5I420dnyJcXZ8AfIo314
+=afIn
+-----END PGP SIGNATURE-----

hxtools.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Feb 14 15:49:03 UTC 2011 - jengelh@medozas.de
+
+- Update to hxtools-20110214
+* obsolete scripts removed
+* documentation updates
+- Split package up further into binary, -scripts, -man, and avoid
+  using Recommends: hxtools-data, because zypper defaults to
+  pulling it in by default
+
 -------------------------------------------------------------------
 Tue Dec 21 16:27:06 UTC 2010 - jengelh@medozas.de
 

hxtools.spec

@@ -1,86 +1,96 @@
-#
-# spec file for package hxtools
-#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
-
-
 
 Name:		hxtools
-Version:        20101227
+Version:	20110214
-Release:        1
+Release:	0
 Group:		System/Base
-Url:            http://jengelh.medozas.de/projects/hxtools/
+URL:		http://jengelh.medozas.de/projects/hxtools/
-Summary:        Collection of day-to-day tools
+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:	libHX-devel >= 3.4, freetype2, libcap-devel
-BuildRequires:  pkg-config xorg-x11 xz
+BuildRequires:	xorg-x11, pkg-config, xz
-BuildRequires:  -hxtools-data
+BuildRoot:	%_tmppath/%name-%version-build
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Recommends:	%name-scripts = %version, %name-man = %version
-Recommends:     hxtools-data = %version
 
-%if "%{?vendor_uuid}" != ""
+%define build_profile 1
-Provides:       %name(vendor:%vendor_uuid) = %version-%release
-%endif
 
 %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
+* newns(8) — clone current filesystem namespace and start a process
+* 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) — VGA font file assembler
+
+%package scripts
+Group:		System/Base
+Summary:	Collection of day-to-day tools (scripts)
+BuildArch:	noarch
+Recommends:	%name, %name-man
+
+%description scripts
+Architecture-independent programs from hxtools.
+
 * checkbrack(1) — check parenthesis and bracket count
 * cwdiff(1) — run wdiff with color
-* declone(1) — break hardlinks
 * diff2php(1) — transform patch to self-serving PHP file
 * doxygen-kerneldoc-filter(1) — filter for Doxygen to support kerneldoc
-* fd0ssh(1) — pipe for password-over-stdin support to ssh
 * filenameconv(1) — convert file name encoding
 * flv2avi(1) — repackage Flash video into an AVI container with PCM audio
 * fnt2bdf(1) — convert VGA raw fonts to X11 BDF
 * git-author-stat(1) — show commit author statistics of a git repository
 * git-export-patch(1) — produce perfect patch from git comits for mail submission
 * git-forest(1) — display the commit history forest
-* git-lemon(1) — don't just pick cherries, but take it all (cherry- pick a commit range)
 * git-new-root(1) — start a new root in the git history
 * git-revert-stats(1) — show reverting statistics of a git repository
 * git-track(1) — set up branch for tracking a remote
 * man2html(1) — convert nroff manpages to HTML
-* newns(8) — clone current filesystem namespace and start a process
-* ofl(1) — open file lister (replaces fuser and lsof -m)
 * pesubst(1) — perl-regexp stream substitution (replaces sed for sub‐ stitutions)
 * pmap_dirty(1) — display amount of RAM a process uses hard
 * recursive_lower(1) — recursively lowercase all filenames
 * spec-beautifier(1) — program to clean up RPM .spec files
 * sysinfo(1) — print IRC-style system information banner
-* tailhex(1) — hex dumper with tail-following support
-* utmp_register(1) — make entries in the utmp/wtmp database
 * vcsaview(8) — display a screen dump in VCSA format
-* vfontas(1) — VGA font file assembler
 * wktimer(1) — work timer
 
+%package man
+Group:		Documentation/Man
+Summary:	Manual pages for the hxtools suite
+BuildArch:	noarch
+
+%description man
+This package contains the manual pages for the binaries and scripts
+from hxtools.
+
 %package data
-License:        GPL,PD
 Group:		System/Base
-Summary:        Collection day-to-day tools (data)
+Summary:	Collection of day-to-day tools (data)
-Requires:       hxtools = %version
-Obsoletes:      hxtools-noarch
 BuildArch:	noarch
 
 %description data
-Architecture-indepent data for hxtools.
+Architecture-independent data from hxtools.
+
+* VAIO U3 keymap
+* additional fonts for console and xterm
+* additional syntax highlighting definitions for mcedit
+
+%package profile
+Group:		System/Base
+Summary:	The hxtools shell environment
+Requires:	%name = %version, %name-scripts = %version
+Requires:	%name-data = %version
+BuildArch:	noarch
+
+%description profile
+Bash environment settings from hxtools. Particularly, this provides
+the SUSE 6.x ls color scheme, and an uncluttered PS1 that shows
+only important parts of a path.
 
 %prep
 %setup -q
@@ -99,18 +109,24 @@ b="%buildroot";
 rm -Rf "$b";
 mkdir "$b";
 make install DESTDIR="$b";
-install -dm0755 "$b/%_sysconfdir/openldap/schema" "$b/%_datadir/mc/syntax";
+
+install -dm0755 "$b/%_datadir/mc/syntax";
 install -pm0644 cooledit/*.syntax "$b/%_datadir/mc/syntax/";
+install -dm0755 "$b/%_sysconfdir/openldap/schema";
 install -pm0644 data/rfc2307bis-utf8.schema "$b/%_sysconfdir/openldap/schema/";
+
 cd "$b";
-find * -type f ! -wholename "usr/share/man*" -print0 | \
+find ./%_bindir ./%_libexecdir ! -type d -exec grep -l ELF {} + | \
-	xargs -0 grep -l ELF | perl -ne 'print"/$_"' >"$o/binary.lst";
+	perl -pe 's{^\./+}{/}' >"$o/binary.lst";
-find * -type f ! -wholename "usr/share/man*" -print0 | \
+find ./%_bindir ./%_libexecdir ! -type d -exec grep -L ELF {} + | \
-	xargs -0 grep -L ELF | perl -ne 'print"/$_"' >"$o/data.lst";
+	perl -pe 's{^\./+}{/}' >"$o/scripts.lst";
-chmod a+x "$b/%_sysconfdir"/hx*.bash;
+
-ln "$b/%_sysconfdir/hxtools_dircolors" "$b/%_sysconfdir/DIR_COLORS";
+%if 0%{?build_profile}
 mkdir -p "$b/%_sysconfdir/profile.d";
-ln -s "../hxtools_profile.bash" "$b/%_sysconfdir/profile.d/z_hxtools_profile.sh";
+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";
@@ -119,19 +135,29 @@ rm -Rf "%buildroot";
 %defattr(-,root,root)
 %dir %_libexecdir/%name
 
-%files data -f data.lst
+%files scripts -f scripts.lst
+%defattr(-,root,root)
+%dir %_libexecdir/%name
+
+%files man
+%defattr(-,root,root)
+%doc %_mandir/*/*
+
+%files data
 %defattr(-,root,root)
-%config %_sysconfdir/hx*
-%config %_sysconfdir/DIR_COLORS
-%config %_sysconfdir/profile.d/*
 %dir %_sysconfdir/openldap
 %dir %_sysconfdir/openldap/schema
 %config %_sysconfdir/openldap/schema/*
-%dir %_libexecdir/%name
 %_datadir/%name
 %_datadir/kbd
 %_datadir/fonts/misc
 %_datadir/mc
-%doc %_mandir/*/*
+
+%if 0%{?build_profile}
+%files profile
+%defattr(-,root,root)
+%config %_sysconfdir/hxloginpref.conf
+%config %_sysconfdir/profile.d/*
+%endif
 
 %changelog