[wicd/f21] Remove check for daemon patch (#1074315)

David Cantrell dcantrel at fedoraproject.org
Mon Sep 29 13:12:10 UTC 2014


commit 49d5ecfbfa956426f7b674c988c52695133c6c75
Author: David Cantrell <dcantrell at redhat.com>
Date:   Mon Sep 29 09:11:38 2014 -0400

    Remove check for daemon patch (#1074315)

 wicd-1.7.2.4-check-for-daemon.patch |   17 -----------------
 wicd.spec                           |   26 +++++++++++---------------
 2 files changed, 11 insertions(+), 32 deletions(-)
---
diff --git a/wicd.spec b/wicd.spec
index e8e0b6c..8346f1c 100644
--- a/wicd.spec
+++ b/wicd.spec
@@ -9,7 +9,7 @@
 
 Name:                wicd
 Version:             1.7.2.4
-Release:             13%{?dist}
+Release:             14%{?dist}
 Summary:             Wireless and wired network connection manager
 
 Group:               System Environment/Base
@@ -24,10 +24,9 @@ Patch2:              wicd-1.7.2.4-dbus-policy.patch
 Patch3:              wicd-1.7.1-DaemonClosing.patch
 Patch4:              wicd-1.7.2.4-unicode.patch
 Patch5:              770_769.diff
-Patch6:              wicd-1.7.2.4-check-for-daemon.patch
-Patch7:              wicd-1.7.2.4-curses_bz894646.patch
-Patch8:              wicd-1.7.2.4-sanitize.patch
-Patch9:              wicd-1.7.2.4-translate-args.patch
+Patch6:              wicd-1.7.2.4-curses_bz894646.patch
+Patch7:              wicd-1.7.2.4-sanitize.patch
+Patch8:              wicd-1.7.2.4-translate-args.patch
 
 BuildRoot:           %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 BuildRequires:       babel
@@ -116,24 +115,18 @@ Client program for wicd that uses a GTK+ interface.
 # For https://bugzilla.redhat.com/show_bug.cgi?id=981667
 %patch5 -p0
 
-# In wicd-client.py (the GTK+ client), make sure we were able to talk to
-# the daemon before running.  If we could not, exit as a failure and explain
-# to the user what they should try.
-# https://bugzilla.redhat.com/show_bug.cgi?id=1074315
-%patch6 -p1
-
 # Fix curses client crash on startup.
 # https://bugzilla.redhat.com/show_bug.cgi?id=894646
-%patch7 -p1
+%patch6 -p1
 
 # Prevent crash when saving network settings
 # Upstream bug report and patch:
 # https://bugs.launchpad.net/wicd/+bug/993912
-%patch8 -p1
+%patch7 -p1
 
 # translate() on a string requires the table as the first argument
 # https://bugzilla.redhat.com/show_bug.cgi?id=1005515
-%patch9 -p1
+%patch8 -p1
  
 %build
 rm -f po/ast.po
@@ -304,7 +297,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg
 
 %changelog
-* Thu Sep 25 2014 David Cantrell <dcantrell at redhat.com> - 1.7.2.4-12
+* Mon Sep 29 2014 David Cantrell <dcantrell at redhat.com> - 1.7.2.4-14
+- Remove check for daemon patch (#1074315)
+
+* Thu Sep 25 2014 David Cantrell <dcantrell at redhat.com> - 1.7.2.4-13
 - Fix string.translate() usage in misc.py (#1005515)
 
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.2.4-12


More information about the scm-commits mailing list