From b3002d21bbf89e152b8df98ddaff3b1081559434 Mon Sep 17 00:00:00 2001
From: Rahul <sundaram@fedoraproject.org>
Date: Mon, 28 Mar 2011 05:58:33 +0530
Subject: [PATCH] New upstream release.  Resolves rhbz#654800 Update spec to
 match current guidelines Some spec file fixes from Alexander Todorov.
 Resolves rhbz#632559 Drop patch

---
 .gitignore               |  1 +
 sources                  |  2 +-
 usb_modeswitch-data.spec | 22 ++++++++++++----------
 ztemf691.patch           | 33 ---------------------------------
 4 files changed, 14 insertions(+), 44 deletions(-)
 delete mode 100644 ztemf691.patch

diff --git a/.gitignore b/.gitignore
index 875f3e3..f4d1f21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ usb-modeswitch-data-20100621.tar.bz2
 usb-modeswitch-data-20100707.tar.bz2
 usb-modeswitch-data-20100817.tar.bz2
 /usb-modeswitch-data-20101222.tar.bz2
+/usb-modeswitch-data-20110227.tar.bz2
diff --git a/sources b/sources
index 7d14299..791e8ab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e386386bc389c2a8184c7ea4136fde0e  usb-modeswitch-data-20101222.tar.bz2
+2f5e5bfa21a97b705a22f95bec367793  usb-modeswitch-data-20110227.tar.bz2
diff --git a/usb_modeswitch-data.spec b/usb_modeswitch-data.spec
index d58dec9..e6b612b 100644
--- a/usb_modeswitch-data.spec
+++ b/usb_modeswitch-data.spec
@@ -1,20 +1,19 @@
 %define source_name	usb-modeswitch-data
 
 Name:		usb_modeswitch-data
-Version:	20101222
-Release:	2%{?dist}
+Version:	20110227
+Release:	1%{?dist}
 Summary:	USB Modeswitch gets mobile broadband cards in operational mode
 Summary(de):	USB Modeswitch aktiviert UMTS-Karten
 Group:		Applications/System
 License:	GPLv2+
 URL:		http://www.draisberghof.de/usb_modeswitch/
-Source0:	http://www.draisberghof.de/%{name}/%{source_name}-%{version}.tar.bz2
+Source0:	http://www.draisberghof.de/usb_modeswitch/%{source_name}-%{version}.tar.bz2
 BuildArch:	noarch
 Requires:	tcl
 Requires:	udev
 Requires:	usb_modeswitch >= 1.1.2
 
-Patch0: ztemf691.patch
 
 %description
 USB Modeswitch brings up your datacard into operational mode. When plugged
@@ -37,8 +36,8 @@ um zu funktionieren.
 
 %prep
 %setup -q -n %{source_name}-%{version}
-%patch0 -p1
 
+%build
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -48,9 +47,6 @@ mkdir -p $RPM_BUILD_ROOT/lib/udev/rules.d/
 install -p -m 644  usb_modeswitch.d/* $RPM_BUILD_ROOT%{_sysconfdir}/usb_modeswitch.d/
 install -p -m 644 40-usb_modeswitch.rules $RPM_BUILD_ROOT/lib/udev/rules.d
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post 
 udevadm control --reload-rules
 
@@ -60,10 +56,16 @@ udevadm control --reload-rules
 %files
 %defattr(-,root,root,-)
 /lib/udev/rules.d/40-usb_modeswitch.rules
-%{_sysconfdir}/usb_modeswitch.d/
+%config(noreplace) %{_sysconfdir}/usb_modeswitch.d/
 %doc ChangeLog COPYING README
 
 %changelog
+* Mon Mar 28 2011 Rahul Sundaram <sundaram@fedoraproject.org> 20110227-1
+- New upstream release.  Resolves rhbz#654800
+- Update spec to match current guidelines
+- Some spec file fixes from Alexander Todorov. Resolves rhbz#632559
+- Drop patch
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 20101222-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
@@ -77,7 +79,7 @@ udevadm control --reload-rules
 - New upstream
 
 * Tue Jun 22 2010 Huzaifa Sidhpurwala <huzaifas@redhat.com> 20100621-1
-- New upstream  
+- New upstream
 
 * Tue Apr 20 2010 Huzaifa Sidhpurwala <huzaifas@redhat.com> 20100418-2
 - Remove buildroot, make package noarch
diff --git a/ztemf691.patch b/ztemf691.patch
deleted file mode 100644
index 8b71d76..0000000
--- a/ztemf691.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -up usb-modeswitch-data-20101222/40-usb_modeswitch.rules.1201 usb-modeswitch-data-20101222/40-usb_modeswitch.rules
---- usb-modeswitch-data-20101222/40-usb_modeswitch.rules.1201	2010-12-30 16:09:26.951149009 -0600
-+++ usb-modeswitch-data-20101222/40-usb_modeswitch.rules	2010-12-30 16:10:07.591149003 -0600
-@@ -399,6 +399,9 @@ ATTRS{idVendor}=="19d2", ATTRS{idProduct
- # Vodafone (ZTE) K3806-Z
- ATTRS{idVendor}=="19d2", ATTRS{idProduct}=="1013", RUN+="usb_modeswitch '%b/%k'"
- 
-+# T-Mobile Rocket 2 (ZTE) MF691
-+ATTRS{idVendor}=="19d2", ATTRS{idProduct}=="1201", RUN+="usb_modeswitch '%b/%k'"
-+
- # ZTE devices
- ATTRS{idVendor}=="19d2", ATTRS{idProduct}=="2000", RUN+="usb_modeswitch '%b/%k'"
- 
-diff -up usb-modeswitch-data-20101222/usb_modeswitch.d/19d2:1201.1201 usb-modeswitch-data-20101222/usb_modeswitch.d/19d2:1201
---- usb-modeswitch-data-20101222/usb_modeswitch.d/19d2:1201.1201	2010-12-30 16:10:39.107149000 -0600
-+++ usb-modeswitch-data-20101222/usb_modeswitch.d/19d2:1201	2010-12-30 16:11:28.013149003 -0600
-@@ -0,0 +1,16 @@
-+########################################################
-+# T-Mobile Rocket 2 (ZTE) MF691
-+#
-+# Note:
-+#      This device has multiple USB profiles. Depending upon how it is flipped
-+#      from storage mode to modem mode determines its final PID and the packages
-+#      shown on its ISO CD image.
-+
-+DefaultVendor=  0x19d2
-+DefaultProduct= 0x1201
-+
-+TargetVendor=   0x19d2
-+TargetProduct=  0x1203
-+                                                                               
-+MessageContent="5553424392020000000000000000061B000000020000000000000000000000"
-+