From 21d7f373e3fc5ca297162d53772afc79d93e8781 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Thu, 4 Aug 2016 23:46:32 +0200 Subject: [PATCH] usb-modeswitch-data: update to 20160803. --- .../patches/0001-fix-destdir.patch | 21 +++++++------------ srcpkgs/usb-modeswitch-data/template | 4 ++-- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/srcpkgs/usb-modeswitch-data/patches/0001-fix-destdir.patch b/srcpkgs/usb-modeswitch-data/patches/0001-fix-destdir.patch index d9295799953..5cf92235184 100644 --- a/srcpkgs/usb-modeswitch-data/patches/0001-fix-destdir.patch +++ b/srcpkgs/usb-modeswitch-data/patches/0001-fix-destdir.patch @@ -1,8 +1,8 @@ ---- Makefile.orig 2015-11-01 10:29:27.000000000 +0100 -+++ Makefile 2015-11-02 09:36:50.940967748 +0100 +--- Makefile.orig 2016-08-03 19:08:23.000000000 +0200 ++++ Makefile 2016-08-04 23:44:35.642686213 +0200 @@ -1,9 +1,9 @@ PROG = usb-modeswitch-data - VERS = 20151101 + VERS = 20160803 RM = /bin/rm -f -PREFIX = $(DESTDIR)/usr -ETCDIR = $(DESTDIR)/etc @@ -13,8 +13,8 @@ .PHONY: clean -@@ -18,26 +18,26 @@ install: all files-install db-install ru - install-packed: files-install db-install-packed rules-reload +@@ -18,28 +18,28 @@ install: all files-install db-install + install-packed: files-install db-install-packed files-install: - install -d $(PREFIX)/share/usb_modeswitch @@ -34,20 +34,13 @@ db-install-packed: @# Create a compressed tar without gzip timestamp, so tar.gz @# differs only if content is different - cd ./usb_modeswitch.d; tar --mode=go=rX,u+rw,a-s -cf ../configPack.tar * + cd ./usb_modeswitch.d; find * -print0 | LC_ALL=C sort -z | tar --no-recursion --null --files-from=- --mode=go=rX,u+rw,a-s -cf ../configPack.tar gzip -f9n ./configPack.tar - install --mode=644 -t $(PREFIX)/share/usb_modeswitch ./configPack.tar.gz + install --mode=644 -t $(DESTDIR)/$(PREFIX)/share/usb_modeswitch ./configPack.tar.gz rm -f ./configPack.tar.gz - rules-reload: -- @if [ -f $(ETCDIR)/issue ]; then \ -+ @if [ -f $(DESTDIR)/$(ETCDIR)/issue ]; then \ - UDEVADM=`which udevadm 2>/dev/null`; \ - if [ "x$$UDEVADM" != "x" ]; then \ - UDEVADM_VER=`$$UDEVADM -V 2>/dev/null`; \ -@@ -57,7 +57,7 @@ rules-reload: - uninstall: files-uninstall rules-reload + uninstall: files-uninstall files-uninstall: - $(RM) $(RULESDIR)/40-usb_modeswitch.rules diff --git a/srcpkgs/usb-modeswitch-data/template b/srcpkgs/usb-modeswitch-data/template index 01f683616f4..bb3adfda291 100644 --- a/srcpkgs/usb-modeswitch-data/template +++ b/srcpkgs/usb-modeswitch-data/template @@ -1,6 +1,6 @@ # Template file for 'usb-modeswitch-data' pkgname=usb-modeswitch-data -version=20160612 +version=20160803 revision=1 build_style=gnu-makefile short_desc="Mode switching tool for controlling 'multi-mode' USB devices (data files)" @@ -8,6 +8,6 @@ maintainer="Enno Boland " license="GPL-2" homepage="http://www.draisberghof.de/usb_modeswitch/" distfiles="http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-${version}.tar.bz2" -checksum=9c99c03a126ae98b373bacc8e78be6b88ee33e9439291fa59477a866832f6914 +checksum=83f4a277c6e34b8537740ae16bf9275008f7bf3f326134e0f846656a61a756fe make_install_args="RULESDIR=/usr/lib/udev/rules.d" noarch=yes