[NetworkManager/f22] dns: revert resolv.conf symlink stuff (should only be in F23+, not F22)

[Daniel Williams]

commit ee316b279fa71f99d7cf77dd9a930238d996c4a0
Author: Dan Williams <dcbw at redhat.com>
Date:   Thu Mar 5 08:54:01 2015 -0600

    dns: revert resolv.conf symlink stuff (should only be in F23+, not F22)

 0001-rh1116999-resolv-conf-symlink.patch | 283 -------------------------------
 NetworkManager.spec                      |   7 +-
 2 files changed, 4 insertions(+), 286 deletions(-)
---
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 6bac5fb..3e3924b 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -10,7 +10,7 @@
 %define snapshot %{nil}
 %define git_sha %{nil}
 %define realversion 1.0.0
-%define release_version 6
+%define release_version 7
 %define epoch_version 1
 
 %define obsoletes_nmver 1:0.9.9.95-1
@@ -78,7 +78,6 @@ Source3: 20-connectivity-fedora.conf
 
 # Not upstream.
 Patch0: 0000-explain-dns1-dns2.patch
-Patch1: 0001-rh1116999-resolv-conf-symlink.patch
 
 # http://cgit.freedesktop.org/NetworkManager/NetworkManager/commit/?id=a687d1f9e0f75b987f40335934b54aa748f6724b
 # https://bugzilla.redhat.com/show_bug.cgi?id=1162636
@@ -369,7 +368,6 @@ by nm-connection-editor and nm-applet in a non-graphical environment.
 %setup -q -n NetworkManager-%{realversion}
 
 %patch0 -p1 -b .0000-explain-dns1-dns2.orig
-%patch1 -p1 -b .0001-rh1116999-resolv-conf-symlink.orig
 %patch2 -p1 -b .bridge_resume
 %patch3 -p1 -b .v6ll-flush
 %patch4 -p1 -b .bgo742823-connectivity-no-dns.orig
@@ -665,6 +663,9 @@ fi
 %endif
 
 %changelog
+* Thu Mar  5 2015 Dan Williams <dcbw at redhat.com> - 1:1.0.0-7
+- dns: revert resolv.conf symlink stuff (should only be in F23+, not F22)
+
 * Thu Mar  5 2015 Dan Williams <dcbw at redhat.com> - 1:1.0.0-6
 - connectivity: fix checking when no valid DNS servers are present (rh #1199098)