Accepting request 147731 from system:install:head

- moved man pages into git

- cleanup of spec
- added missing manual pages

OBS-URL: https://build.opensuse.org/request/show/147731
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hwinfo?expand=0&rev=113

hwinfo-20.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:270ffde0ce764b8748daaba708d06870ad14a55367b028a5ce1745d20f73bdb5
-size 647480

hwinfo-20.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:19ebd90f3b6a5b1c7902f3346a194721c77e8199f07ae3a724d46a6e04dca239
+size 648163

hwinfo.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Jan  9 13:58:00 CET 2013 - snwint@suse.de
+
+- moved man pages into git
+
+-------------------------------------------------------------------
+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
 

hwinfo.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package hwinfo
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -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,11 @@ PreReq:         /sbin/ldconfig
 Summary:        Hardware Library
 License:        GPL-2.0+
 Group:          Hardware/Other
-Version:        20.0
+# Until migration to github this should be correct url
+Url:            http://gitorious.org/opensuse/hwinfo
+Version:        20.1
 Release:        0
-Source:         hwinfo-20.0.tar.bz2
+Source:         hwinfo-20.1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -49,9 +52,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 +75,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 doc/check_hd.1 %{buildroot}%{_mandir}/man1/
+  install -m 644 doc/convert_hd.1 %{buildroot}%{_mandir}/man1/
+  install -m 644 doc/getsysinfo.1 %{buildroot}%{_mandir}/man1/
+  install -m 644 doc/mk_isdnhwdb.1 %{buildroot}%{_mandir}/man1/
+  install -m 644 doc/hwinfo.8 %{buildroot}%{_mandir}/man8/
   mkdir -p %{buildroot}/var/lib/hardware/udi
 
 %clean 
@@ -100,7 +108,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 +120,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