[systemd] Undo the resolv.conf workaround, Aim for a proper fix in Rawhide.

[Michal Schmidt]

commit 5427ee063b892ffe6d3d89600abb5e575b0593ee
Author: Michal Schmidt <mschmidt at redhat.com>
Date:   Fri Feb 20 17:31:06 2015 +0100

    Undo the resolv.conf workaround, Aim for a proper fix in Rawhide.
    
    Do not merge this into F22 until other components are fixed (#1116651).
    
    [See me reverting my reverts like a real weenie!]

 fedora-disable-resolv.conf-symlink.patch | 25 -------------------------
 systemd.spec                             |  6 ++++--
 2 files changed, 4 insertions(+), 27 deletions(-)
---
diff --git a/systemd.spec b/systemd.spec
index d56de92..615de76 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -16,7 +16,7 @@
 Name:           systemd
 Url:            http://www.freedesktop.org/wiki/Software/systemd
 Version:        219
-Release:        4%{?gitcommit:.git%{gitcommit}}%{?dist}
+Release:        5%{?gitcommit:.git%{gitcommit}}%{?dist}
 # For a breakdown of the licensing, see README
 License:        LGPLv2+ and MIT and GPLv2+
 Summary:        A System and Service Manager
@@ -44,7 +44,6 @@ Source8:        systemd-journal-gatewayd.xml
 
 # kernel-install patch for grubby, drop if grubby is obsolete
 Patch1000:      kernel-install-grubby.patch
-Patch1001:      fedora-disable-resolv.conf-symlink.patch
 
 %global num_patches %{lua: c=0; for i,p in ipairs(patches) do c=c+1; end; print(c);}
 
@@ -863,6 +862,9 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd
 /usr/lib/firewalld/services/*
 
 %changelog
+* Fri Feb 20 2015 Michal Schmidt <mschmidt at redhat.com> - 219-5
+- Undo the resolv.conf workaround, Aim for a proper fix in Rawhide.
+
 * Fri Feb 20 2015 Michal Schmidt <mschmidt at redhat.com> - 219-4
 - Revive fedora-disable-resolv.conf-symlink.patch to unbreak composes.