packages: usb-modeswitch/usb-modeswitch.spec, usb-modeswitch/usb-modeswitch...

[megabajt]

Author: megabajt                     Date: Thu Apr 28 10:28:16 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.1.7

---- Files affected:
packages/usb-modeswitch:
   usb-modeswitch.spec (1.6 -> 1.7) , usb-modeswitch-makefile.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/usb-modeswitch/usb-modeswitch.spec
diff -u packages/usb-modeswitch/usb-modeswitch.spec:1.6 packages/usb-modeswitch/usb-modeswitch.spec:1.7
--- packages/usb-modeswitch/usb-modeswitch.spec:1.6	Fri Dec  3 22:19:39 2010
+++ packages/usb-modeswitch/usb-modeswitch.spec	Thu Apr 28 12:28:11 2011
@@ -1,17 +1,16 @@
 # $Revision$, $Date$
-# TODO: Check if passing $(CPPFLAGS) to gcc is OK as done in patch0 ?
 Summary:	Switching tool for controlling "flip flop" USB devices
 Name:		usb-modeswitch
-Version:	1.1.5
+Version:	1.1.7
 Release:	1
 License:	GPL v2
 Group:		Applications
 Source0:	http://www.draisberghof.de/usb_modeswitch/%{name}-%{version}.tar.bz2
-# Source0-md5:	23a44bc67b9ca4b6f3fdaf4bf3618df9
+# Source0-md5:	b75e42b7b2d30e9d4cbd5c159f925247
 Patch0:		%{name}-makefile.patch
 URL:		http://www.draisberghof.de/usb_modeswitch/
 BuildRequires:	libusb-compat-devel
-Requires:	tcl
+Requires:	tcl >= 8.4
 Suggests:	usb-modeswitch-data
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -25,7 +24,7 @@
 
 %prep
 %setup -q
-# %%patch0 -p1
+%patch0 -p1
 
 %build
 %{__make} \
@@ -36,7 +35,6 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/usb_modeswitch.d
 
 %{__make} install \
 	PREFIX=$RPM_BUILD_ROOT%{_prefix} \
@@ -51,9 +49,9 @@
 %attr(755,root,root) %{_sbindir}/usb_modeswitch
 %attr(755,root,root) %{_sbindir}/usb_modeswitch_dispatcher
 %attr(755,root,root) /lib/udev/usb_modeswitch
-%dir %{_sysconfdir}/usb_modeswitch.d
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/usb_modeswitch.conf
 %{_mandir}/man1/usb_modeswitch.1*
+%dir /var/lib/usb_modeswitch
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -61,6 +59,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2011/04/28 10:28:11  megabajt
+- updated to 1.1.7
+
 Revision 1.6  2010/12/03 21:19:39  sls
 - ver. 1.1.5
 

================================================================
Index: packages/usb-modeswitch/usb-modeswitch-makefile.patch
diff -u packages/usb-modeswitch/usb-modeswitch-makefile.patch:1.2 packages/usb-modeswitch/usb-modeswitch-makefile.patch:1.3
--- packages/usb-modeswitch/usb-modeswitch-makefile.patch:1.2	Fri Jul 23 16:52:27 2010
+++ packages/usb-modeswitch/usb-modeswitch-makefile.patch	Thu Apr 28 12:28:11 2011
@@ -1,23 +1,19 @@
-diff -urN usb-modeswitch-1.1.3/Makefile usb-modeswitch-1.1.3.new//Makefile
---- usb-modeswitch-1.1.3/Makefile	2010-06-21 21:27:29.000000000 +0200
-+++ usb-modeswitch-1.1.3.new//Makefile	2010-07-23 16:31:27.765913994 +0200
-@@ -1,7 +1,10 @@
- PROG        = usb_modeswitch
- VERS        = 1.1.3
+--- usb-modeswitch-1.1.7/Makefile.makefile	2011-02-23 00:07:38.000000000 +0100
++++ usb-modeswitch-1.1.7/Makefile	2011-04-28 12:08:16.000000000 +0200
+@@ -2,6 +2,8 @@ PROG        = usb_modeswitch
+ VERS        = 1.1.7
  CC          = gcc
--CFLAGS      += -Wall -l usb
-+CFLAGS      += -Wall
+ CFLAGS      += -Wall
 +CPPFLAGS    = $(NULL)
 +LDFLAGS     = $(NULL)
-+LIBS        = -lusb
+ LIBS        = -l usb
  RM          = /bin/rm -f
  OBJS        = usb_modeswitch.c
- PREFIX      = $(DESTDIR)/usr
-@@ -15,7 +18,7 @@
+@@ -16,7 +18,7 @@ MANDIR      = $(PREFIX)/share/man/man1
  all:        $(PROG)
  
  $(PROG): $(OBJS)
--	$(CC) -o $(PROG) $(OBJS) $(CFLAGS) $(LDFLAGS)
+-	$(CC) -o $(PROG) $(OBJS) $(CFLAGS) $(LIBS) $(LDFLAGS)
 +	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(OBJS) $(LIBS)
  
  clean:
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/usb-modeswitch/usb-modeswitch.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/usb-modeswitch/usb-modeswitch-makefile.patch?r1=1.2&r2=1.3&f=u