From 277dafac64fcd9a91ffb5b90628149c88839954b Mon Sep 17 00:00:00 2001 From: Huzaifa Sidhpurwala Date: Tue, 25 Oct 2011 10:41:31 +0530 Subject: [PATCH 1/3] New upstream version --- .gitignore | 1 + sources | 2 +- usb_modeswitch-data.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index bee13ae..e74c2e9 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ usb-modeswitch-data-20100817.tar.bz2 /usb-modeswitch-data-20101222.tar.bz2 /usb-modeswitch-data-20110227.tar.bz2 /usb-modeswitch-data-20110714.tar.bz2 +/usb-modeswitch-data-20111023.tar.bz2 diff --git a/sources b/sources index e5b16d1..715d224 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -da8ecaac36d97b5474d43d52fe66c272 usb-modeswitch-data-20110714.tar.bz2 +6e7cb67d0428bda241600b038ba11aeb usb-modeswitch-data-20111023.tar.bz2 diff --git a/usb_modeswitch-data.spec b/usb_modeswitch-data.spec index 1b1e3e5..ea8ced6 100644 --- a/usb_modeswitch-data.spec +++ b/usb_modeswitch-data.spec @@ -1,7 +1,7 @@ %define source_name usb-modeswitch-data Name: usb_modeswitch-data -Version: 20110714 +Version: 20111023 Release: 1%{?dist} Summary: USB Modeswitch gets mobile broadband cards in operational mode Summary(de): USB Modeswitch aktiviert UMTS-Karten @@ -60,6 +60,9 @@ udevadm control --reload-rules %doc ChangeLog COPYING README %changelog +* Tue Oct 25 2011 Huzaifa Sidhpurwala 20111023-1 +- New upstream release. + * Mon Jul 25 2011 Huzaifa Sidhpurwala 20110714-1 - New upstream release. Resolves rhbz#714648 From 382d9db008d247f3e1591b0bda5759623f680500 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 24 Apr 2012 14:34:36 -0500 Subject: [PATCH 2/3] Update to new upstream version --- .gitignore | 1 + sources | 2 +- usb_modeswitch-data.spec | 13 ++++++++++--- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index e74c2e9..8151763 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ usb-modeswitch-data-20100817.tar.bz2 /usb-modeswitch-data-20110227.tar.bz2 /usb-modeswitch-data-20110714.tar.bz2 /usb-modeswitch-data-20111023.tar.bz2 +/usb-modeswitch-data-20120120.tar.bz2 diff --git a/sources b/sources index 715d224..d1ef36a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6e7cb67d0428bda241600b038ba11aeb usb-modeswitch-data-20111023.tar.bz2 +c899cc9c71bb35f3ec600b7cd1455c65 usb-modeswitch-data-20120120.tar.bz2 diff --git a/usb_modeswitch-data.spec b/usb_modeswitch-data.spec index ea8ced6..1e540bd 100644 --- a/usb_modeswitch-data.spec +++ b/usb_modeswitch-data.spec @@ -1,7 +1,7 @@ %define source_name usb-modeswitch-data Name: usb_modeswitch-data -Version: 20111023 +Version: 20120120 Release: 1%{?dist} Summary: USB Modeswitch gets mobile broadband cards in operational mode Summary(de): USB Modeswitch aktiviert UMTS-Karten @@ -10,9 +10,12 @@ License: GPLv2+ URL: http://www.draisberghof.de/usb_modeswitch/ Source0: http://www.draisberghof.de/usb_modeswitch/%{source_name}-%{version}.tar.bz2 BuildArch: noarch -Requires: tcl Requires: udev -Requires: usb_modeswitch >= 1.1.2 + +# 1.2.3-1 removes the requirement on TCL which was mistakenly +# in the -data package, so require 1.2.3-1 to ensure that both +# usb_modeswitch and -data agree on whether TCL is needed or not +Requires: usb_modeswitch >= 1.2.3-1 %description @@ -60,6 +63,10 @@ udevadm control --reload-rules %doc ChangeLog COPYING README %changelog +* Tue Apr 24 2012 Dan Williams 20120120-1 +- New upstream release. +- Remove dep on TCL since nothing in the package requires it + * Tue Oct 25 2011 Huzaifa Sidhpurwala 20111023-1 - New upstream release. From af9e1be7b5cf5d78623fd1c7aaa3cd9f058ee3c0 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 18 Jun 2012 09:36:15 -0500 Subject: [PATCH 3/3] New upstream release; handle udevadm failure (rh #824849) --- sources | 2 +- usb_modeswitch-data.spec | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sources b/sources index d1ef36a..085a3aa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c899cc9c71bb35f3ec600b7cd1455c65 usb-modeswitch-data-20120120.tar.bz2 +4a948331d5b9fccba4a89d3e62040cc3 usb-modeswitch-data-20120531.tar.bz2 diff --git a/usb_modeswitch-data.spec b/usb_modeswitch-data.spec index 1e540bd..19e1fc7 100644 --- a/usb_modeswitch-data.spec +++ b/usb_modeswitch-data.spec @@ -1,7 +1,7 @@ %define source_name usb-modeswitch-data Name: usb_modeswitch-data -Version: 20120120 +Version: 20120531 Release: 1%{?dist} Summary: USB Modeswitch gets mobile broadband cards in operational mode Summary(de): USB Modeswitch aktiviert UMTS-Karten @@ -51,10 +51,10 @@ install -p -m 644 usb_modeswitch.d/* $RPM_BUILD_ROOT%{_sysconfdir}/usb_modeswit install -p -m 644 40-usb_modeswitch.rules $RPM_BUILD_ROOT/lib/udev/rules.d %post -udevadm control --reload-rules +udevadm control --reload-rules || : %postun -udevadm control --reload-rules +udevadm control --reload-rules || : %files %defattr(-,root,root,-) @@ -63,6 +63,10 @@ udevadm control --reload-rules %doc ChangeLog COPYING README %changelog +* Mon Jun 18 2012 Dan Williams 20120531-1 +- New upstream data release +- Handle failure of udevadm control --reload-rules (rh #824849) + * Tue Apr 24 2012 Dan Williams 20120120-1 - New upstream release. - Remove dep on TCL since nothing in the package requires it