Accepting request 140347 from home:bmanojlovic:branches:system:install:head

mostly cosmetic and rpmlint fixes, added missing manual pages

OBS-URL: https://build.opensuse.org/request/show/140347
OBS-URL: https://build.opensuse.org/package/show/system:install:head/hwinfo?expand=0&rev=49
This commit is contained in:
Steffen Winterfeldt 2013-01-09 12:52:05 +00:00 committed by Git OBS Bridge
parent 6f442bdd55
commit 90e392a458
6 changed files with 165 additions and 12 deletions

84
check_hd.1 Normal file
View File

@ -0,0 +1,84 @@
.TH CHECK_HD "1" "User Commands"
.SH NAME
manual page for check_hd
.SH SYNOPSIS
.B check_hd
[\fIoptions\fR] \fIfiles\fR
.SH DESCRIPTION
Try to put hardware data into a consistent form.
.TP
\fB\-\-check\fR
do a lot of checks and remove unnecessary data
.TP
\fB\-\-sort\fR
sort data
.TP
\fB\-\-reverse\fR
reverse sorting order
.TP
\fB\-\-split\fR
write separate entries for each key
.TP
\fB\-\-with\-source\fR
add comment to each item indicating info source
.TP
\fB\-\-mini\fR
minimal data base (basically driver info only)
.TP
\fB\-\-join\-keys\-first\fR
when combining similar items, join entries with
common keys first (default is common values first)
.TP
\fB\-\-cfile\fR file
create C file to be included in libhd
.TP
\fB\-\-no\-compact\fR
don't try to make C version as small as possible
.TP
\fB\-\-out\fR file
write results to file, default is "hd.ids"
.TP
\fB\-\-log\fR file
write log info to file, default is "hd.log"
.IP
Note: check_hd works with libhd/hwinfo internal format only;
to convert to other formats, use convert_hd
.PP
Try to put hardware data into a consistent form.
.TP
\fB\-\-check\fR
do a lot of checks and remove unnecessary data
.TP
\fB\-\-sort\fR
sort data
.TP
\fB\-\-reverse\fR
reverse sorting order
.TP
\fB\-\-split\fR
write separate entries for each key
.TP
\fB\-\-with\-source\fR
add comment to each item indicating info source
.TP
\fB\-\-mini\fR
minimal data base (basically driver info only)
.TP
\fB\-\-join\-keys\-first\fR
when combining similar items, join entries with
common keys first (default is common values first)
.TP
\fB\-\-cfile\fR file
create C file to be included in libhd
.TP
\fB\-\-no\-compact\fR
don't try to make C version as small as possible
.TP
\fB\-\-out\fR file
write results to file, default is "hd.ids"
.TP
\fB\-\-log\fR file
write log info to file, default is "hd.log"
.IP
Note: check_hd works with libhd/hwinfo internal format only;
to convert to other formats, use convert_hd

29
convert_hd.1 Normal file
View File

@ -0,0 +1,29 @@
.TH CONVERT_HD "1" "User Commands"
.SH NAME
convert_hd
.SH SYNOPSIS
.B convert_hd
[\fIoptions\fR] \fIfiles\fR
.SH DESCRIPTION
Convert various hardware info to libhd/hwinfo internal format or to XML.
.TP
\fB\-\-ids\fR
write internal format (default) to "hd.ids"
.TP
\fB\-\-no\-ids\fR
do not write internal format
.TP
\fB\-\-xml\fR
write XML to "hd.xml", DTD to "hd.dtd"
.TP
\fB\-\-no\-xml\fR
do not write XML (default)
.TP
\fB\-\-with\-source\fR
add comment to each item indicating info source
.TP
\fB\-\-internal\-dtd\fR
generate internal dtd
.IP
Note: for more sophisticated operations on hardware data use check_hd.
.IP

10
getsysinfo.1 Normal file
View File

@ -0,0 +1,10 @@
.TH GETSYSINFO "1" "getsysinfo" "User Commands"
.SH NAME
getsysinfo
.SH SYNOPSIS
.B getsysinfo
.SH DESCRIPTION
Collect some system data that are useful for debugging
hardware detection bugs.
.PP

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Nov 6 14:22:44 UTC 2012 - boris@steki.net
- cleanup of spec
- added missing manual pages
-------------------------------------------------------------------
Mon Aug 6 11:55:17 CEST 2012 - snwint@suse.de

View File

@ -20,6 +20,7 @@ Name: hwinfo
BuildRequires: doxygen
BuildRequires: flex
BuildRequires: perl-XML-Parser
BuildRequires: pkg-config
BuildRequires: udev
%if 0%{?rhel_version} == 0
BuildRequires: perl-XML-Writer
@ -33,9 +34,15 @@ PreReq: /sbin/ldconfig
Summary: Hardware Library
License: GPL-2.0+
Group: Hardware/Other
# Until migration to github this should be correct url
Url: http://gitorious.org/opensuse/hwinfo
Version: 20.0
Release: 0
Source: hwinfo-20.0.tar.bz2
Source0: hwinfo-20.0.tar.bz2
Source1: check_hd.1
Source2: convert_hd.1
Source3: getsysinfo.1
Source4: mk_isdnhwdb.1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -49,9 +56,12 @@ Summary: Hardware Detection Library
Group: Development/Libraries/C and C++
Provides: libhddev
Obsoletes: libhddev
Requires: %name = %version perl-XML-Parser udev wireless-tools
Requires: %name = %version
Requires: perl-XML-Parser
Requires: udev
Requires: wireless-tools
%if 0%{?rhel_version} == 0
Requires: perl-XML-Writer
Requires: perl-XML-Writer
%endif
%if 0%{?suse_version}
Requires: libexpat-devel
@ -69,21 +79,23 @@ system.
%setup
%build
# This package failed when testing with -Wl,-as-needed being default.
# So we disable it here, if you want to retest, just delete this comment and the line below.
export SUSE_ASNEEDED=0
make static
install -d -m 755 %{buildroot}%{_libdir}
install -m 644 src/libhd.a %{buildroot}%{_libdir}
# make copy of static library for installation
cp src/libhd.a .
make clean
make LIBDIR=%{_libdir}
make doc
gzip -9c doc/hwinfo.8 >hwinfo.8.gz
%install
make install DESTDIR=%{buildroot} LIBDIR=%{_libdir}
install -d -m 755 %{buildroot}%{_mandir}/man8
install -m 644 hwinfo.8.gz %{buildroot}%{_mandir}/man8
install -m 644 libhd.a %{buildroot}%{_libdir}
install -d -m 755 %{buildroot}%{_mandir}/man8/
install -d -m 755 %{buildroot}%{_mandir}/man1/
install -m 644 %{SOURCE1} %{buildroot}%{_mandir}/man1/check_hd.1
install -m 644 %{SOURCE2} %{buildroot}%{_mandir}/man1/convert_hd.1
install -m 644 %{SOURCE3} %{buildroot}%{_mandir}/man1/getsysinfo.1
install -m 644 %{SOURCE4} %{buildroot}%{_mandir}/man1/mk_isdnhwdb.1
install -m 644 doc/hwinfo.8 %{buildroot}%{_mandir}/man8/
mkdir -p %{buildroot}/var/lib/hardware/udi
%clean
@ -100,7 +112,9 @@ rm -rf %{buildroot}
/usr/sbin/getsysinfo
%{_libdir}/libhd.so.*
%doc README
%doc %{_mandir}/man8/hwinfo.8.gz
%doc %{_mandir}/man1/getsysinfo.1*
%doc %{_mandir}/man1/mk_isdnhwdb.1*
%doc %{_mandir}/man8/hwinfo.8*
%dir /var/lib/hardware
%dir /var/lib/hardware/udi
%dir /usr/share/hwinfo
@ -110,6 +124,8 @@ rm -rf %{buildroot}
%defattr(-,root,root)
/usr/sbin/check_hd
/usr/sbin/convert_hd
%doc %{_mandir}/man1/convert_hd.1*
%doc %{_mandir}/man1/check_hd.1*
%{_libdir}/libhd.so
%{_libdir}/libhd.a
%{_libdir}/pkgconfig/hwinfo.pc

8
mk_isdnhwdb.1 Normal file
View File

@ -0,0 +1,8 @@
.TH mk_isdnhwdb "1" "mk_isdnhwdb" "User Commands"
.SH NAME
mk_isdnhwdb
.SH SYNOPSIS
.B mk_isdnhwdb
.SH DESCRIPTION
.PP