[rpms/fedora-release] f45: Drop obsoletes and hacks for unsupported releases

[rpms/fedora-release] f45: Drop obsoletes and hacks for unsupported releases

[Stephen Gallagher]

            A new commit has been pushed.

            Repo   : rpms/fedora-release
            Branch : f45
            Commit : 85f1547039745648851099f2758c737d085d3a41
            Author : Stephen Gallagher <sgallagh@redhat.com>
            Date   : 2020-04-21T13:25:02-04:00
            Stats  : +0/-16 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedora-release/c/85f1547039745648851099f2758c737d085d3a41?branch=f45

            Log:
            Drop obsoletes and hacks for unsupported releases

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>

---
diff --git a/fedora-release.spec b/fedora-release.spec
index 4966b9b..3d38f4d 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -66,9 +66,6 @@ Suggests:   fedora-release
 
 Obsoletes:  redhat-release
 Provides:   redhat-release
-Obsoletes:  fedora-release < 30-0.12
-
-Obsoletes:  convert-to-edition < 30-0.7
 Requires:   fedora-repos(%{version})
 
 %description common
@@ -528,18 +525,6 @@ sed -e "s#\$version#%{bug_version}#g" -e 's/<!--.*-->//;/^$/d' %{SOURCE19} > %{b
 install -d %{buildroot}%{_sysconfdir}/swid/swidtags.d
 ln -s %{_swidtagdir} %{buildroot}%{_sysconfdir}/swid/swidtags.d/fedoraproject.org
 
-# Work around upgrade bug
-# See https://bugzilla.redhat.com/show_bug.cgi?id=1710543
-# If we are upgrading from a system with two fedora-release-$EDITION packages
-# on it, if DNF upgrade decides to keep the drop that doesn't match
-# /usr/lib/variant, it will forcibly create a /usr/lib/os-release symlink
-# after the new upgraded package is installed, resulting in an unbootable
-# system. As a hack, we'll assume ownership of /usr/lib/variant and set it to
-# a nonexistent edition name, to ensure that no symlink gets created.
-# This hack and this file can be dropped in Fedora 32, since we don't support
-# upgrades from Fedora N-3.
-echo _DISABLED_ > %{buildroot}%{_prefix}/lib/variant
-
 
 %files common
 %license licenses/LICENSE licenses/Fedora-Legal-README.txt
@@ -555,7 +540,6 @@ echo _DISABLED_ > %{buildroot}%{_prefix}/lib/variant
 %attr(0644,root,root) %{_prefix}/lib/issue.net
 %config(noreplace) %{_sysconfdir}/issue.net
 %dir %{_sysconfdir}/issue.d
-%attr(0644,root,root) %{_prefix}/lib/variant
 %attr(0644,root,root) %{_rpmconfigdir}/macros.d/macros.dist
 %dir %{_prefix}/lib/systemd/user-preset/
 %{_prefix}/lib/systemd/user-preset/90-default-user.preset