diff --git a/1bbb:f017 b/1bbb:f017 deleted file mode 100644 index 63d4c8a..0000000 --- a/1bbb:f017 +++ /dev/null @@ -1,7 +0,0 @@ -# Alcatel OT-X220D - -TargetVendor= 0x1bbb -TargetProduct=0x0017 - -MessageContent="55534243123456788000000080000606f50402527000000000000000000000" - diff --git a/add_alcatel_ot_x220d.patch b/add_alcatel_ot_x220d.patch deleted file mode 100644 index 918b022..0000000 --- a/add_alcatel_ot_x220d.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- usb-modeswitch-data-20120531/40-usb_modeswitch.rules.orig 2012-07-21 01:41:58.881830000 +0200 -+++ usb-modeswitch-data-20120531/40-usb_modeswitch.rules 2012-07-21 01:44:12.596825115 +0200 -@@ -626,6 +626,9 @@ - # Alcatel X200/X200L/X060S - ATTRS{idVendor}=="1bbb", ATTRS{idProduct}=="f000", RUN+="usb_modeswitch '%b/%k'" - -+# Alcatel OT X220D -+ATTRS{idVendor}=="1bbb", ATTRS{idProduct}=="f017", RUN+="usb_modeswitch '%b/%k'" -+ - # Alcatel OT X220L - ATTRS{idVendor}=="1bbb", ATTRS{idProduct}=="f052", RUN+="usb_modeswitch '%b/%k'" - diff --git a/huawei-timing.patch b/huawei-timing.patch index b1cbbac..0431f5a 100644 --- a/huawei-timing.patch +++ b/huawei-timing.patch @@ -1,19 +1,19 @@ diff -u -r usb-modeswitch-data-20120531.org/40-usb_modeswitch.rules usb-modeswitch-data-20120531/40-usb_modeswitch.rules ---- usb-modeswitch-data-20120531.org/40-usb_modeswitch.rules 2012-09-28 14:15:48.751958694 +0200 -+++ usb-modeswitch-data-20120531/40-usb_modeswitch.rules 2012-09-28 14:16:49.063343878 +0200 -@@ -443,6 +443,9 @@ +--- usb-modeswitch-data-20121109.org/40-usb_modeswitch.rules 2012-12-03 14:15:48.751958694 +0200 ++++ usb-modeswitch-data2-0121109/40-usb_modeswitch.rules 2012-12-03 14:16:49.063343878 +0200 +@@ -474,6 +474,9 @@ # Huawei E173s - ATTRS{idVendor}=="12d1", ATTRS{idProduct}=="1c0b", RUN+="usb_modeswitch '%b/%k'" + ATTR{idVendor}=="12d1", ATTR{idProduct}=="1c0b", RUN+="usb_modeswitch '%b/%k'" +# Huawei E173s +ATTRS{idVendor}=="12d1", ATTRS{idProduct}=="1c00", RUN+="usb_modeswitch -w 3000 '%b/%k'" + # Huawei E173 (Moviestar) - ATTRS{idVendor}=="12d1", ATTRS{idProduct}=="1c24", RUN+="usb_modeswitch '%b/%k'" + ATTR{idVendor}=="12d1", ATTR{idProduct}=="1c24", RUN+="usb_modeswitch '%b/%k'" diff -u -r usb-modeswitch-data-20120531.org/usb_modeswitch.d/12d1:1c0b usb-modeswitch-data-20120531/usb_modeswitch.d/12d1:1c0b ---- usb-modeswitch-data-20120531.org/usb_modeswitch.d/12d1:1c0b 2012-09-28 14:15:48.754958714 +0200 -+++ usb-modeswitch-data-20120531/usb_modeswitch.d/12d1:1c0b 2012-09-28 14:17:35.495640324 +0200 +--- usb-modeswitch-data-20121109.org/usb_modeswitch.d/12d1:1c0b 2012-12-03 14:15:48.754958714 +0200 ++++ usb-modeswitch-data-20121109/usb_modeswitch.d/12d1:1c0b 2012-12-03 14:17:35.495640324 +0200 @@ -5,3 +5,4 @@ MessageContent="55534243123456780000000000000011062000000100000000000000000000" diff --git a/usb-modeswitch-1.2.3.tar.bz2 b/usb-modeswitch-1.2.3.tar.bz2 deleted file mode 100644 index 42d1ed5..0000000 --- a/usb-modeswitch-1.2.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:924bf9357241c3d2de37b381ebbe82818fa3fd19fcffdc2dcaf2b5d17d29723b -size 254562 diff --git a/usb-modeswitch-1.2.5.tar.bz2 b/usb-modeswitch-1.2.5.tar.bz2 new file mode 100644 index 0000000..f8aa35a --- /dev/null +++ b/usb-modeswitch-1.2.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce47a3dec3e4c93e0a2fcea64278d0e289e6e78d8e1381c54f03986e443ab90f +size 259200 diff --git a/usb-modeswitch-data-20120531.tar.bz2 b/usb-modeswitch-data-20120531.tar.bz2 deleted file mode 100644 index ed3f1dc..0000000 --- a/usb-modeswitch-data-20120531.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eed06c3b8d93e69dc708e20d4c621c52e9e9a6325df87cc627c3ef4608b206a9 -size 20390 diff --git a/usb-modeswitch-data-20121109.tar.bz2 b/usb-modeswitch-data-20121109.tar.bz2 new file mode 100644 index 0000000..7a2f127 --- /dev/null +++ b/usb-modeswitch-data-20121109.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a74346a471d540ba9da7d7b332ad35ea05ff7375297c0da87da5be675293d5a5 +size 21558 diff --git a/usb_modeswitch.changes b/usb_modeswitch.changes index 207a8e0..91defce 100644 --- a/usb_modeswitch.changes +++ b/usb_modeswitch.changes @@ -1,4 +1,19 @@ ------------------------------------------------------------------- +Mon Dec 3 12:34:50 UTC 2012 - p.drouand@gmail.com + +- Update to 1.2.5: + * Initial support for MBIM devices, use with data package >= 20121109; + checking for these is the automatic default, new parameter NoMBIMCheck + prevents the check per device in case of problems; new global option + to set "delay_use" of usb-storage (as low values may prevent + mode-switching); + * fix for handling multi-configuration devices (thanks + to Bjørn Mork for advice) +- Removed files: + * add_alcatel_ot_x220d.patch: supported on upstream release + * 1bbb:f017: supported on upstream release +- Adapt huawei-timing.patch for 1.2.5 +------------------------------------------------------------------- Wed Oct 17 13:31:34 UTC 2012 - fcrozat@suse.com - Fix build with new udev directory location diff --git a/usb_modeswitch.spec b/usb_modeswitch.spec index 73afad0..11b17e8 100644 --- a/usb_modeswitch.spec +++ b/usb_modeswitch.spec @@ -23,19 +23,17 @@ %endif Name: usb_modeswitch -Version: 1.2.3 +Version: 1.2.5 Release: 0 Summary: A mode switching tool for controlling multiple-device USB gear License: GPL-2.0+ Group: Hardware/Mobile Url: http://www.draisberghof.de/usb_modeswitch %define source_name usb-modeswitch -%define date 20120531 +%define date 20121109 Source0: http://www.draisberghof.de/usb_modeswitch/%{source_name}-%{version}.tar.bz2 Source1: %{source_name}-data-%{date}.tar.bz2 Source2: %{name}-data.rpmlintrc -Source3: 1bbb:f017 -Patch0: add_alcatel_ot_x220d.patch Patch1: huawei-timing.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: fdupes @@ -69,7 +67,6 @@ Data files for usb_modeswitch package. %prep %setup -q -a1 -n %{source_name}-%{version} -%patch0 %patch1 -p1 -d %{source_name}-data-%{date} %build @@ -78,7 +75,6 @@ CFLAGS="%{optflags}" make %install %makeinstall UDEVDIR=$RPM_BUILD_ROOT%{_udevdir} cd %{source_name}-data-%{date} -cp %{SOURCE3} . %makeinstall RULESDIR=$RPM_BUILD_ROOT%{_udevdir}/rules.d %fdupes -s $RPM_BUILD_ROOT