[rpms/fedora-release] f45: Follow systemd upstream guidelines for VARIANT and VARIANT_ID

[rpms/fedora-release] f45: Follow systemd upstream guidelines for VARIANT and VARIANT_ID

[Dennis Gilmore]

A new commit has been pushed.

Repo   : rpms/fedora-release
Branch : f45
Commit : 7771fa60975f46a7a5f45fa5466e640ccef3b7e0
Author : Dennis Gilmore <dennis@ausil.us>
Date   : 2015-05-08T09:45:29-05:00
Stats  : +23/-15 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/fedora-release/c/7771fa60975f46a7a5f45fa5466e640ccef3b7e0?branch=f45

Log:
Follow systemd upstream guidelines for VARIANT and VARIANT_ID

---
diff --git a/fedora-release.spec b/fedora-release.spec
index 7999932..3008d1c 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -5,7 +5,7 @@
 Summary:        Fedora release files
 Name:           fedora-release
 Version:        23
-Release:        0.7
+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
@@ -160,9 +163,7 @@ if [ $1 = 0 ]; then
 fi
 
 %post cloud
-if [ $1 -eq 1 ] ; then
-    # Initial installation
-
+# Run every time
     # If there is no link to os-release yet from some other
     # release package, create it
     test -e /usr/lib/os-release || \
@@ -173,7 +174,6 @@ if [ $1 -eq 1 ] ; then
     if [ \! -h /usr/lib/os-release -o "x$(readlink /usr/lib/os-release)" = "xos.release.d/os-release-fedora" ]; then
         ln -sf ./os.release.d/os-release-cloud /usr/lib/os-release || :
     fi
-fi
 
 %postun cloud
 # Uninstall
@@ -186,9 +186,7 @@ fi
 
 
 %post server
-if [ $1 -eq 1 ] ; then
-    # Initial installation
-
+# Run every time
     # If there is no link to os-release yet from some other
     # release package, create it
     test -e /usr/lib/os-release || \
@@ -200,6 +198,9 @@ if [ $1 -eq 1 ] ; then
         ln -sf ./os.release.d/os-release-server /usr/lib/os-release || :
     fi
 
+if [ $1 -eq 1 ] ; then
+    # Initial installation
+
     # fix up after %%systemd_post in packages
     # possibly installed before our preset file was added
     units=$(sed -n 's/^enable//p' \
@@ -217,9 +218,7 @@ if [ $1 = 0 ]; then
 fi
 
 %post workstation
-if [ $1 -eq 1 ] ; then
-    # Initial installation
-
+# Run every time
     # If there is no link to os-release yet from some other
     # release package, create it
     test -e /usr/lib/os-release || \
@@ -231,6 +230,9 @@ if [ $1 -eq 1 ] ; then
         ln -sf ./os.release.d/os-release-workstation /usr/lib/os-release || :
     fi
 
+if [ $1 -eq 1 ] ; then
+    # Initial installation
+
     # fix up after %%systemd_post in packages
     # possibly installed before our preset file was added
     units=$(sed -n 's/^disable//p' \
@@ -288,6 +290,12 @@ 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
+
 * Tue Mar 17 2015 Dennis Gilmore <dennis@ausil.us> - 23-0.7
 - make the os-release sysmlinks all relative
 

diff --git a/sources b/sources
index d3ada0b..642f19b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bf535e25bcd5ef74ba66dfaa37cf8e6d  fedora-release-23.tar.bz2
+fb6a7452631b533e39589f4befb2bcde  fedora-release-23.tar.bz2