From 991c189c6c48ae57bc61eaec07000506a102cc09c9d12ed6b9b9670a0f26be69 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Mon, 19 Jul 2010 19:24:30 +0000
Subject: [PATCH] Accepting request 42847 from hardware

Copy from hardware/usb_modeswitch based on submit request 42847 from user anubisg1

OBS-URL: https://build.opensuse.org/request/show/42847
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/usb_modeswitch?expand=0&rev=4
---
 usb-modeswitch-1.1.2.tar.bz2         |  3 ---
 usb-modeswitch-1.1.3.tar.bz2         |  3 +++
 usb-modeswitch-data-20100418.tar.bz2 |  3 ---
 usb-modeswitch-data-20100707.tar.bz2 |  3 +++
 usb_modeswitch.changes               | 18 ++++++++++++++++++
 usb_modeswitch.spec                  | 28 +++++++++-------------------
 6 files changed, 33 insertions(+), 25 deletions(-)
 delete mode 100644 usb-modeswitch-1.1.2.tar.bz2
 create mode 100644 usb-modeswitch-1.1.3.tar.bz2
 delete mode 100644 usb-modeswitch-data-20100418.tar.bz2
 create mode 100644 usb-modeswitch-data-20100707.tar.bz2

diff --git a/usb-modeswitch-1.1.2.tar.bz2 b/usb-modeswitch-1.1.2.tar.bz2
deleted file mode 100644
index 6eeb3bd..0000000
--- a/usb-modeswitch-1.1.2.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:df26395e07a4e286d6a51d6dd3f8374024a10e1b51ef8c07f105da443268f0f3
-size 35001
diff --git a/usb-modeswitch-1.1.3.tar.bz2 b/usb-modeswitch-1.1.3.tar.bz2
new file mode 100644
index 0000000..39d11a6
--- /dev/null
+++ b/usb-modeswitch-1.1.3.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7d5f0a45ac03eb578678b1f0c99df924b55de40d684aa02f890958c3fe3fcafb
+size 35937
diff --git a/usb-modeswitch-data-20100418.tar.bz2 b/usb-modeswitch-data-20100418.tar.bz2
deleted file mode 100644
index b036720..0000000
--- a/usb-modeswitch-data-20100418.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dd316f5f9e456da26fd2ce7b84ffdc065a1ea725492a79401cf1012a94c09453
-size 13967
diff --git a/usb-modeswitch-data-20100707.tar.bz2 b/usb-modeswitch-data-20100707.tar.bz2
new file mode 100644
index 0000000..4f97e01
--- /dev/null
+++ b/usb-modeswitch-data-20100707.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:427adf0728884d3001d019926b34ca7170455c5c40e8dd19e7517759e381b886
+size 14964
diff --git a/usb_modeswitch.changes b/usb_modeswitch.changes
index a1a6d66..beb12d0 100644
--- a/usb_modeswitch.changes
+++ b/usb_modeswitch.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Thu Jul  8 23:21:58 UTC 2010 - andrea@opensuse.org
+
+- New upstream version 1.1.3
+  * Added delay option to separate multiple message
+    transfers by millisecs
+  * fixed (possibly dangerous) sloppy string handling
+  * Added "clear_halt" for response endpoint
+  * Small additions in Makefile (install with -D)
+  * Changes in option handling (no more default config file!)
+  * Symlink feature in wrapper can now cope with devices providing
+    more than one interrupt port
+  * Wrapper now ignores package manager leftovers in config folder
+  * Replaced bash-specific syntax in wrapper
+  * Changed ZTE skipping (if existing rules are found) to warning
+- update data package to version 20100707
+- spec file clean up (sources support 'make install')
+
 -------------------------------------------------------------------
 Tue May 18 07:30:48 UTC 2010 - aj@suse.de
 
diff --git a/usb_modeswitch.spec b/usb_modeswitch.spec
index ab8efcd..21801af 100644
--- a/usb_modeswitch.spec
+++ b/usb_modeswitch.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package usb_modeswitch (Version 1.1.2)
+# spec file for package usb_modeswitch (Version 1.1.3)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -16,17 +16,18 @@
 #
 
 
-Url:            http://www.draisberghof.de/usb_modeswitch/
+Url:            http://www.draisberghof.de/usb_modeswitch
 
 Name:           usb_modeswitch
 %define source_name	usb-modeswitch
-Version:        1.1.2
+%define date		20100707
+Version:        1.1.3
 Release:        1
 Summary:        A mode switching tool for controlling multiple-device USB gear
 Group:          Hardware/Mobile
 License:        GPLv2+
 Source0:        http://www.draisberghof.de/usb_modeswitch/%{source_name}-%{version}.tar.bz2
-Source1:        %{source_name}-data-20100418.tar.bz2
+Source1:        %{source_name}-data-%{date}.tar.bz2
 Source2:        %{name}-data.rpmlintrc
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  libusb-devel udev
@@ -62,20 +63,9 @@ Data files for usb_modeswitch package.
 CFLAGS="$RPM_OPT_FLAGS" make
 
 %install
-mkdir -p $RPM_BUILD_ROOT/lib/udev/rules.d/
-mkdir -p $RPM_BUILD_ROOT%{_sbindir}
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
-install -p -m 755 usb_modeswitch $RPM_BUILD_ROOT%{_sbindir}/
-install -p -m 755 usb_modeswitch.tcl $RPM_BUILD_ROOT/lib/udev/usb_modeswitch
-install -p -m 644 usb_modeswitch.conf $RPM_BUILD_ROOT%{_sysconfdir}/
-install -p -m 644 usb_modeswitch.setup $RPM_BUILD_ROOT%{_sysconfdir}/
-install -p -m 644 usb_modeswitch.1 $RPM_BUILD_ROOT/%{_mandir}/man1/
-# Data files
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/usb_modeswitch.d/
-install -p -m 644 usb-modeswitch-data-20100418/usb_modeswitch.d/* $RPM_BUILD_ROOT%{_sysconfdir}/usb_modeswitch.d/
-chmod 644 $RPM_BUILD_ROOT/etc/usb_modeswitch.d/*
-install -p -m 644 usb-modeswitch-data-20100418/40-usb_modeswitch.rules $RPM_BUILD_ROOT/lib/udev/rules.d/
+%makeinstall
+cd %{source_name}-data-%{date}
+%makeinstall
 
 %files
 %defattr(-,root,root,-)
@@ -83,7 +73,7 @@ install -p -m 644 usb-modeswitch-data-20100418/40-usb_modeswitch.rules $RPM_BUIL
 %{_sbindir}/usb_modeswitch
 /lib/udev/usb_modeswitch
 %config %{_sysconfdir}/usb_modeswitch.conf
-%config %{_sysconfdir}/usb_modeswitch.setup
+#%config %{_sysconfdir}/usb_modeswitch.setup
 %{_mandir}/man1/usb_modeswitch.1.gz
 
 %files data