From 6d9acab4be02a82678c826d9683a53f316a82c65 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: May 08 2015 14:43:52 +0000
Subject: os-release: Populate VARIANT and VARIANT_ID values


The systemd upstream project has accepted VARIANT as a cross-
distribution feature, but with a minor change from our original
approach: they wanted a human-presentable VARIANT and a separate
lower-case-only VARIANT_ID value. This patch implements this in
Fedora to keep us aligned with systemd upstream.

---

diff --git a/fedora-release.spec b/fedora-release.spec
index 83c6a7d..1a77793 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -5,7 +5,7 @@
 Summary:        Fedora release files
 Name:           fedora-release
 Version:        23
-Release:        0.8
+Release:        0.9
 License:        MIT
 Group:          System Environment/Base
 URL:            http://fedoraproject.org
@@ -110,17 +110,20 @@ EOF
 # Cloud
 cp -p $RPM_BUILD_ROOT/usr/lib/os.release.d/os-release-fedora \
       $RPM_BUILD_ROOT/usr/lib/os.release.d/os-release-cloud
-echo "VARIANT=Cloud" >> $RPM_BUILD_ROOT/usr/lib/os.release.d/os-release-cloud
+echo "VARIANT=Cloud Edition" >> $RPM_BUILD_ROOT/usr/lib/os.release.d/os-release-cloud
+echo "VARIANT_ID=cloud" >> $RPM_BUILD_ROOT/usr/lib/os.release.d/os-release-cloud
 
 # Server
 cp -p $RPM_BUILD_ROOT/usr/lib/os.release.d/os-release-fedora \
       $RPM_BUILD_ROOT/usr/lib/os.release.d/os-release-server
-echo "VARIANT=Server" >> $RPM_BUILD_ROOT/usr/lib/os.release.d/os-release-server
+echo "VARIANT=Server Edition" >> $RPM_BUILD_ROOT/usr/lib/os.release.d/os-release-server
+echo "VARIANT_ID=server" >> $RPM_BUILD_ROOT/usr/lib/os.release.d/os-release-server
 
 # Workstation
 cp -p $RPM_BUILD_ROOT/usr/lib/os.release.d/os-release-fedora \
       $RPM_BUILD_ROOT/usr/lib/os.release.d/os-release-workstation
-echo "VARIANT=Workstation" >> $RPM_BUILD_ROOT/usr/lib/os.release.d/os-release-workstation
+echo "VARIANT=Workstation Edition" >> $RPM_BUILD_ROOT/usr/lib/os.release.d/os-release-workstation
+echo "VARIANT_ID=workstation" >> $RPM_BUILD_ROOT/usr/lib/os.release.d/os-release-workstation
 
 # Create the symlink for /etc/os-release
 # This will be standard until %post when the
@@ -287,6 +290,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_prefix}/lib/systemd/system-preset/80-workstation.preset
 
 %changelog
+* Tue May 05 2015 Stephen Gallagher <sgallagh@redhat.com> 23-0.9
+- Follow systemd upstream guidelines for VARIANT and VARIANT_ID
+
 * Thu Mar 19 2015 Stephen Gallagher <sgallagh@redhat.com> 23-0.8
 - Handle os-release upgrades from existing productized installations