[fedora-release/f21] Add systemd preset file for Fedora Server

[Dennis Gilmore]

commit 3993a02eaf99302b3ce0bc08272cb671b1494263
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Mon Jul 14 12:24:33 2014 -0500

    Add systemd preset file for Fedora Server
    
    - Add requirement on Cockpit

 fedora-release.spec |   14 +++++++++++++-
 sources             |    2 +-
 2 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/fedora-release.spec b/fedora-release.spec
index 47310e1..4833b8e 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -5,7 +5,7 @@
 Summary:        Fedora release files
 Name:           fedora-release
 Version:        21
-Release:        0.10
+Release:        0.11
 License:        MIT
 Group:          System Environment/Base
 URL:            http://fedoraproject.org
@@ -51,6 +51,8 @@ Summary:        Base package for Fedora Server-specific default configurations
 Provides:       system-release-server
 Provides:       system-release-server(%{version})
 Requires:       fedora-release = %{version}-%{release}
+Requires:       systemd
+Requires:       cockpit
 Conflicts:      fedora-release-cloud
 Conflicts:      fedora-release-standard
 Conflicts:      fedora-release-workstation
@@ -116,6 +118,11 @@ cat >> $RPM_BUILD_ROOT%{_rpmconfigdir}/macros.d/macros.dist << EOF
 %%fc%{dist_version}                1
 EOF
 
+# Add Product-specific presets
+mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-preset/
+# Fedora Server
+install -m 0644 80-server.preset %{buildroot}%{_prefix}/lib/systemd/system-preset/
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -143,12 +150,17 @@ rm -rf $RPM_BUILD_ROOT
 %files server
 %{!?_licensedir:%global license %%doc}
 %license LICENSE
+%{_prefix}/lib/systemd/system-preset/80-server.preset
 
 %files workstation
 %{!?_licensedir:%global license %%doc}
 %license LICENSE
 
 %changelog
+* Mon Jul 14 2014 Stephen Gallagher <sgallagh at redhat.com> 21-0.11
+- Add systemd preset file for Fedora Server
+- Add requirement on Cockpit
+
 * Sat Jul 12 2014 Tom Callaway <spot at fedoraproject.org> - 21-0.10
 - fix license handling
 
diff --git a/sources b/sources
index 4fc6832..908b2ba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-50351f3c5a118ab6a04680849c74f713  fedora-release-21.tar.bz2
+955625b183da5f8c6fdab5b907c613c3  fedora-release-21.tar.bz2