From c2f97cf7620f58491faeb94f83877b62b2d5de37 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Sat, 30 Nov 2019 21:17:21 +0000
Subject: Sat Nov 30 21:17:21 UTC 2019

a/kernel-generic-5.4.1-x86_64-1.txz:  Upgraded.
a/kernel-huge-5.4.1-x86_64-1.txz:  Upgraded.
a/kernel-modules-5.4.1-x86_64-1.txz:  Upgraded.
a/tcsh-6.22.00-x86_64-1.txz:  Upgraded.
a/usb_modeswitch-2.6.0-x86_64-1.txz:  Upgraded.
ap/cups-filters-1.25.13-x86_64-1.txz:  Upgraded.
ap/diffstat-1.63-x86_64-1.txz:  Upgraded.
ap/nano-4.6-x86_64-1.txz:  Upgraded.
d/kernel-headers-5.4.1-x86-1.txz:  Upgraded.
d/meson-0.52.1-x86_64-1.txz:  Upgraded.
d/strace-5.4-x86_64-1.txz:  Upgraded.
k/kernel-source-5.4.1-noarch-1.txz:  Upgraded.
l/elfutils-0.178-x86_64-1.txz:  Upgraded.
l/python-certifi-2019.11.28-x86_64-1.txz:  Upgraded.
n/ca-certificates-20191130-noarch-1.txz:  Upgraded.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.
---
 source/a/usb_modeswitch/usb_modeswitch.SlackBuild | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

(limited to 'source/a/usb_modeswitch/usb_modeswitch.SlackBuild')

diff --git a/source/a/usb_modeswitch/usb_modeswitch.SlackBuild b/source/a/usb_modeswitch/usb_modeswitch.SlackBuild
index d89662973..a75620e80 100755
--- a/source/a/usb_modeswitch/usb_modeswitch.SlackBuild
+++ b/source/a/usb_modeswitch/usb_modeswitch.SlackBuild
@@ -1,8 +1,6 @@
 #!/bin/bash
 
-# Slackware build script for usb_modeswitch.
-
-# Copyright 2010, 2012, 2013, 2015, 2017, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2010, 2012, 2013, 2015, 2017, 2018, 2019  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # Copyright 2010  David Somero, Athens, TN, USA
 # All rights reserved.
 #
@@ -26,8 +24,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=usb_modeswitch
-VERSION=${VERSION:-2.5.2}
-DATAVER=${DATAVER:-20170806}
+VERSION=${VERSION:-2.6.0}
+DATAVER=${DATAVER:-20191128}
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
@@ -72,7 +70,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf $SRCPKGNAM-$VERSION
-tar xvf $CWD/$SRCPKGNAM-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/$SRCPKGNAM-$VERSION.tar.?z || exit 1
 cd $SRCPKGNAM-$VERSION || exit 1
 chown -R root:root .
 find . \
@@ -82,8 +80,6 @@ find . \
  -exec chmod 644 {} \+
 
 make clean || exit 1
-# "make static" uses the embedded "jim" Tcl interpreter
-make static || exit 1
 
 make \
   DESTDIR=$PKG \
@@ -116,10 +112,6 @@ cp -a \
   $PKG/usr/doc/$PKGNAM-$VERSION
 # http://www.draisberghof.de/usb_modeswitch/device_reference.txt.gz
 zcat $CWD/device_reference.txt.gz > $PKG/usr/doc/$PKGNAM-$VERSION/device_reference.txt
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/jim
-cp -a \
-  jim/{AUTHORS,LICENSE,README*} \
-  $PKG/usr/doc/$PKGNAM-$VERSION/jim
 
 # If there's a ChangeLog, installing at least part of the recent history
 # is useful, but don't let it get totally out of control:
@@ -132,7 +124,7 @@ fi
 # Now, install the data pack:
 cd $TMP
 rm -rf usb-modeswitch-data-${DATAVER}
-tar xvf $CWD/usb-modeswitch-data-${DATAVER}.tar.?z* || exit 1
+tar xvf $CWD/usb-modeswitch-data-${DATAVER}.tar.?z || exit 1
 cd usb-modeswitch-data-${DATAVER} || exit 1
 chown -R root:root .
 find . \
-- 
cgit v1.2.3