commit 82e19a751b0c351adc053fc3fcac5e1c58db718f
Author: Jakub Bogusz <[email protected]>
Date: Sat Sep 14 07:29:18 2013 +0200
- updated to 2.0.1
usb-modeswitch-makefile.patch | 16 ++++++++--------
usb-modeswitch.spec | 12 ++++++++----
2 files changed, 16 insertions(+), 12 deletions(-)
---
diff --git a/usb-modeswitch.spec b/usb-modeswitch.spec
index 36e9dc3..dbac4ef 100644
--- a/usb-modeswitch.spec
+++ b/usb-modeswitch.spec
@@ -1,15 +1,16 @@
Summary: Switching tool for controlling "flip flop" USB devices
Summary(pl.UTF-8): Narzędzie do sterowania przełączającymi się
urządzeniami USB
Name: usb-modeswitch
-Version: 1.2.7
+Version: 2.0.1
Release: 1
License: GPL v2
Group: Applications/System
Source0:
http://www.draisberghof.de/usb_modeswitch/%{name}-%{version}.tar.bz2
-# Source0-md5: 18d889d72195534ae9133a8181cad42b
+# Source0-md5: e48d4419d0574d342bb183f7465556d0
Patch0: %{name}-makefile.patch
URL: http://www.draisberghof.de/usb_modeswitch/
-BuildRequires: libusb-compat-devel >= 0.1
+BuildRequires: libusb-devel >= 1.0
+BuildRequires: pkgconfig
Requires: tcl >= 8.4
Suggests: usb-modeswitch-data
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -46,9 +47,10 @@ rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/etc/usb_modeswitch.d
%{__make} install \
- PREFIX=$RPM_BUILD_ROOT%{_prefix} \
DESTDIR=$RPM_BUILD_ROOT
+install -D [email protected]
$RPM_BUILD_ROOT%{systemdunitdir}/[email protected]
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -58,7 +60,9 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_sbindir}/usb_modeswitch
%attr(755,root,root) %{_sbindir}/usb_modeswitch_dispatcher
%attr(755,root,root) /lib/udev/usb_modeswitch
+%{systemdunitdir}/[email protected]
%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/usb_modeswitch.conf
%{_mandir}/man1/usb_modeswitch.1*
+%{_mandir}/man1/usb_modeswitch_dispatcher.1*
%dir /etc/usb_modeswitch.d
%dir /var/lib/usb_modeswitch
diff --git a/usb-modeswitch-makefile.patch b/usb-modeswitch-makefile.patch
index ed93e2b..e151761 100644
--- a/usb-modeswitch-makefile.patch
+++ b/usb-modeswitch-makefile.patch
@@ -1,20 +1,20 @@
---- usb-modeswitch-1.2.4/Makefile.orig 2012-08-12 17:21:10.000000000 +0200
-+++ usb-modeswitch-1.2.4/Makefile 2012-09-01 22:02:56.823006830 +0200
+--- usb-modeswitch-2.0.1/Makefile.orig 2013-09-03 19:22:05.000000000 +0200
++++ usb-modeswitch-2.0.1/Makefile 2013-09-14 07:06:41.048926415 +0200
@@ -2,6 +2,8 @@
- VERS = 1.2.4
+ VERS = 2.0.1
CC ?= gcc
CFLAGS += -Wall
+CPPFLAGS =
+LDFLAGS =
- #LIBS = libusb.a
- LIBS = -l usb
+ LIBS = `pkg-config --libs --cflags libusb-1.0`
RM = /bin/rm -f
-@@ -21,7 +23,7 @@
+ OBJS = usb_modeswitch.c
+@@ -36,7 +38,7 @@
static: $(PROG) dispatcher-static
$(PROG): $(OBJS) usb_modeswitch.h
- $(CC) -o $(PROG) $(OBJS) $(CFLAGS) $(LIBS) $(LDFLAGS)
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(OBJS) $(LIBS)
- dispatcher-static: dispatcher.c usb_modeswitch.tcl
- ./make_static_dispatcher.sh
+ jim/libjim.so:
+ cd jim && CFLAGS="$(CFLAGS)" CC="$(CC)" ./configure
$(JIM_CONFIGURE_OPTS) --shared
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/usb-modeswitch.git/commitdiff/82e19a751b0c351adc053fc3fcac5e1c58db718f
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
