rpm/hxtools
SHA256
1
0
Fork 0
forked from pool/hxtools
Code Pull Requests Activity

Accepting request 108853 from devel:libraries:c_c++

Browse Source 
license update: GPL-2.0+
spec file license should be in SPDX (compatible) format. GPL-2.0+ seems to be the most appropriate license choice for the resulting binary (no GPL-3.0 except for as choice in dual license situation) (forwarded request 108852 from babelworx)

OBS-URL: https://build.opensuse.org/request/show/108853
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hxtools?expand=0&rev=12
This commit is contained in:
Stephan Kulow 2012-03-20 10:27:37 +00:00 committed by Git OBS Bridge
parent ca22b76476
commit f11c537237
3 changed files with 98 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
7a4b085-capabilities.diff Normal file
View File

@ -0,0 +1,32 @@
parent e688e5c6d8a9b0032db2218ab71766f11c19d2ca (rel-20120107-4-ge688e5c)
commit 7a4b085d13182f690b1bbdc971401251b6be09a2
Author: Jan Engelhardt <jengelh@medozas.de>
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

13
hxtools.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Mon Mar 12 11:27:33 UTC 2012 - cfarrell@suse.com
- license update: GPL-2.0+
spec file license should be in SPDX (compatible) format. GPL-2.0+ seems
to be the most appropriate license choice for the resulting binary (no
GPL-3.0 except for as choice in dual license situation)
-------------------------------------------------------------------
Sat Feb 25 10:00:17 UTC 2012 - jengelh@medozas.de
- Avoid fdupes-induced hardlink across partitions
-------------------------------------------------------------------
Sat Jan 7 01:01:53 UTC 2012 - jengelh@medozas.de

66
hxtools.spec
View File

@ -15,23 +15,41 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: hxtools
Version: 20120107
Release: 0
Group: System/Base
Url: http://jengelh.medozas.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
License: GPL,PD
Patch1: 7a4b085-capabilities.diff
BuildRequires: fdupes
BuildRequires: libcap-devel >= 2
# xorg-x11 for "bdftopcf"
BuildRequires: libcap-devel xorg-x11 xz
BuildRequires: pkgconfig >= 0.23 pkgconfig(libHX) >= 3.12
%if 0%{?suse_version}
BuildRequires: xorg-x11
%endif
%if 0%{?rhel_version} || 0%{?fedora_version}
BuildRequires: bdftopcf
%endif
BuildRequires: pkgconfig >= 0.21
BuildRequires: xz
%if 0%{?suse_version} >= 1130
BuildRequires: pkgconfig(libHX) >= 3.12
%else
BuildRequires: libHX-devel >= 3.12
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Recommends: %name-scripts = %version, %name-man = %version
Requires: %name-scripts = %version
%if 0%{?suse_version} >= 1100
Recommends: %name-man = %version
%else
Requires: %name-man = %version
%endif
%define build_profile 1
@ -47,10 +65,17 @@ A collection of various tools. Some of the important ones:
* vfontas(1) — VGA font file assembler
%package scripts
Group: System/Base
Summary: Collection of day-to-day tools (scripts)
Group: System/Base
%if 0%{?suse_version} >= 1120
BuildArch: noarch
Recommends: %name, %name-man
%endif
Requires: %name
%if 0%{?suse_version} >= 1100
Recommends: %name-man
%else
Requires: %name-man
%endif
Requires: perl(Data::Dumper), perl(File::Find)
Requires: perl(File::Find::Rule)
Requires: perl(Getopt::Long), perl(IPC::Open2), perl(Text::CSV_XS)
@ -81,18 +106,22 @@ Architecture-independent programs from hxtools.
* wktimer(1) — work timer
%package man
Group: Documentation/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
from hxtools.
%package data
Group: System/Base
Summary: Collection of day-to-day tools (data)
Group: System/Base
%if 0%{?suse_version} >= 1120
BuildArch: noarch
%endif
%description data
Architecture-independent data from hxtools.
@ -102,11 +131,13 @@ Architecture-independent data from hxtools.
* additional syntax highlighting definitions for mcedit
%package profile
Group: System/Base
Summary: The hxtools shell environment
Group: System/Base
Requires: %name = %version, %name-scripts = %version
Requires: %name-data = %version
%if 0%{?suse_version} >= 1120
BuildArch: noarch
%endif
%description profile
Bash environment settings from hxtools. Particularly, this provides
@ -114,7 +145,13 @@ the SUSE 6.x ls color scheme, and an uncluttered PS1 that shows
only important parts of a path.
%prep
%if 0%{?__xz:1}
%setup -q
%else
tar -xf "%{S:0}" --use=xz;
%setup -DTq
%endif
%patch -P 1 -p1
%build
%configure \
@ -132,7 +169,8 @@ make install DESTDIR="$b";
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/";
ln -s "%_datadir/hxtools/rfc2307bis-utf8.schema" \
"$b/%_sysconfdir/openldap/schema/";
cd "$b";
find ./%_bindir ./%_libexecdir ! -type d -exec grep -l ELF {} + | \
@ -149,6 +187,8 @@ ln -s "%_datadir/%name/hxtools_profile.bash" "$b/%_sysconfdir/profile.d/z_hxtool
rm -Rf "$b/%_sysconfdir/profile.d" "$b/%_sysconfdir"/hx*;
%endif
%fdupes %buildroot
%files -f binary.lst
%defattr(-,root,root)
%dir %_libexecdir/%name