system/hwinfo: Updated for version 17.3.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

4 files changed, 16 insertions, 22 deletions

diff --git a/system/hwinfo/README b/system/hwinfo/README
index e3c10e20d829..062323d4df0f 100644
--- a/system/hwinfo/README
+++ b/system/hwinfo/README
@@ -1,7 +1,7 @@
-A simple program that lists results from the hardware detection
+hwinfo is a simple program that lists results from the hardware detection
 library.
 
-On compilation a binary called "check_hd" is run. This can take quite
+On compilation a binary called "check_hd" is run.  This can take quite
 some time to complete and may look like the compilation process is stuck.
 
-hwinfo requires libx86emu, which is also available from SlackBuilds.org
\ No newline at end of file
+This requires libx86emu.
diff --git a/system/hwinfo/hwinfo.SlackBuild b/system/hwinfo/hwinfo.SlackBuild
index 0d4395d89e06..491fbe2601d6 100644
--- a/system/hwinfo/hwinfo.SlackBuild
+++ b/system/hwinfo/hwinfo.SlackBuild
@@ -23,16 +23,14 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=hwinfo
-VERSION=16.10
+VERSION=17.3
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -67,8 +65,8 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-# remove suse specific syscall
-sed -i '145,149 d' src/hd/kbd.c
+# disable regeneration of changelog and VERSION
+chmod -x ./git2log
 
 # use our CFLAGS
 sed -i "s/?= -O2/?= $SLKCFLAGS/" Makefile.common
@@ -76,10 +74,9 @@ sed -i "s/?= -O2/?= $SLKCFLAGS/" Makefile.common
 make \
   LIBDIR=/usr/lib$LIBDIRSUFFIX
 
-make \
+make install \
   LIBDIR=/usr/lib$LIBDIRSUFFIX \
-  DESTDIR=$PKG \
-  install
+  DESTDIR=$PKG
 
 mkdir -p $PKG/usr/man/man8
 install -m 644 doc/hwinfo.8 $PKG/usr/man/man8/
@@ -87,13 +84,10 @@ install -m 644 doc/hwinfo.8 $PKG/usr/man/man8/
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a Changelog COPYING MAINTAINER README VERSION \
+cp -a changelog COPYING MAINTAINER README VERSION \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/system/hwinfo/hwinfo.info b/system/hwinfo/hwinfo.info
index c2365885aaec..90d4a141a7e2 100644
--- a/system/hwinfo/hwinfo.info
+++ b/system/hwinfo/hwinfo.info
@@ -1,10 +1,10 @@
 PRGNAM="hwinfo"
-VERSION="16.10"
+VERSION="17.3"
 HOMEPAGE="http://gitorious.org/opensuse/hwinfo"
-DOWNLOAD="http://www.liwjatan.at/files/src/hwinfo/hwinfo-16.10.tar.xz"
-MD5SUM="be6c9736602b31a5508d6e7a3833add9"
+DOWNLOAD="http://www.liwjatan.at/files/src/hwinfo/hwinfo-17.3.tar.xz"
+MD5SUM="2d7afba416f8cb8cfd9edf3fe7407d84"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Heinz Wiesinger"
 EMAIL="pprkut@liwjatan.at"
-APPROVED="dsomero"
+APPROVED="rworkman"
diff --git a/system/hwinfo/slack-desc b/system/hwinfo/slack-desc
index e0b23a458439..b503d16112ac 100644
--- a/system/hwinfo/slack-desc
+++ b/system/hwinfo/slack-desc
@@ -8,8 +8,8 @@
       |-----handy-ruler--------------------------------------------------|
 hwinfo: hwinfo (Hardware detection tool)
 hwinfo:
-hwinfo: A simple program that lists results from the hardware detection
-hwinfo: library.
+hwinfo: hwinfo is a simple program that lists results
+hwinfo: from the hardware detection library.
 hwinfo:
 hwinfo: Homepage: http://gitorious.org/opensuse/hwinfo
 hwinfo: