From acd3c8cbd7a998a395e81096d67c4d5a6b5eb99a Mon Sep 17 00:00:00 2001 From: Stephen Walker Date: Mon, 4 Jul 2011 00:50:37 +0000 Subject: [PATCH] [packages] usbutils: update to 003, drop obsolete patch SVN-Revision: 27428 --- utils/usbutils/Makefile | 6 ++--- .../patches/120-fix-zlib-support.patch | 27 ------------------- 2 files changed, 3 insertions(+), 30 deletions(-) delete mode 100644 utils/usbutils/patches/120-fix-zlib-support.patch diff --git a/utils/usbutils/Makefile b/utils/usbutils/Makefile index fef5bfe3eb..d6a443e210 100644 --- a/utils/usbutils/Makefile +++ b/utils/usbutils/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=usbutils -PKG_VERSION:=002 -PKG_RELEASE:=2 +PKG_VERSION:=003 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@KERNEL/linux/utils/usb/usbutils -PKG_MD5SUM:=39e38263ba45690fbad41f248f207d32 +PKG_MD5SUM:=218208b8382ead0f7e49ef7ec0cf77f2 PKG_INSTALL:=1 diff --git a/utils/usbutils/patches/120-fix-zlib-support.patch b/utils/usbutils/patches/120-fix-zlib-support.patch deleted file mode 100644 index 1cba108f41..0000000000 --- a/utils/usbutils/patches/120-fix-zlib-support.patch +++ /dev/null @@ -1,27 +0,0 @@ -Index: usbutils-002/Makefile.am -=================================================================== ---- usbutils-002.orig/Makefile.am 2011-04-14 14:33:22.000000000 +0300 -+++ usbutils-002/Makefile.am 2011-04-14 14:33:32.000000000 +0300 -@@ -6,9 +6,6 @@ - - data_DATA = \ - usb.ids --if HAVE_ZLIB --data_DATA += usb.ids.gz --endif - - bin_PROGRAMS = \ - lsusb -@@ -35,6 +32,12 @@ - lsusb_LDADD = \ - $(LIBUSB_LIBS) - -+if HAVE_ZLIB -+data_DATA += usb.ids.gz -+lsusb_CPPFLAGS += -DHAVE_LIBZ -+lsusb_LDADD += -lz -+endif -+ - man_MANS = \ - lsusb.8 \ - usb-devices.1 -- 2.30.2