From ee0e81ea36158ea622522c4a49f3fdc3d4fe2efd Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: May 08 2015 15:26:32 +0000 Subject: use infor about the Edition instead of the release name in - os-release for productised installs --- diff --git a/fedora-release.spec b/fedora-release.spec index 3008d1c..184747d 100644 --- a/fedora-release.spec +++ b/fedora-release.spec @@ -112,18 +112,21 @@ 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 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 +sed -i -e "s|(%{release_name})|(Cloud Edition)|g" $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 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 +sed -i -e "s|(%{release_name})|(Server Edition)|g" $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 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 +sed -i -e "s|(%{release_name})|(Workstation Edition)|g" $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 @@ -290,6 +293,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_prefix}/lib/systemd/system-preset/80-workstation.preset %changelog +* Fri May 08 2015 Dennis Gilmore - 23-0.10 +- use infor about the Edition instead of the release name in +- os-release for productised installs + * Tue May 05 2015 Stephen Gallagher 23-0.9 - Follow systemd upstream guidelines for VARIANT and VARIANT_ID diff --git a/sources b/sources index 642f19b..40d1998 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fb6a7452631b533e39589f4befb2bcde fedora-release-23.tar.bz2 +d2586f24b2b90f586645807784250d42 fedora-release-23.tar.bz2