[rpms/fedora-release] f45: Merge #95 `RPM macros: Redefining %fedora now changes %dist`

[rpms/fedora-release] f45: Merge #95 `RPM macros: Redefining %fedora now changes %dist`

[Mohan Boddu]

            A new commit has been pushed.

            Repo   : rpms/fedora-release
            Branch : f45
            Commit : e0f0f18490409999f34bda239405fdfd3c385354
            Author : Mohan Boddu <mohanboddu@fedoraproject.org>
            Date   : 2019-10-03T14:32:07+00:00
            Stats  : +5/-7 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedora-release/c/e0f0f18490409999f34bda239405fdfd3c385354?branch=f45

            Log:
            Merge #95 `RPM macros: Redefining %fedora now changes %dist`

Signed-off-by: Mohan Boddu <mohanboddu@fedoraproject.org>

---
diff --git a/fedora-release.spec b/fedora-release.spec
index bdc3129..505d69e 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -14,7 +14,7 @@
 Summary:        Fedora release files
 Name:           fedora-release
 Version:        32
-Release:        0.1
+Release:        0.2
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -481,7 +481,7 @@ cat >> %{buildroot}%{_rpmconfigdir}/macros.d/macros.dist << EOF
 
 %%fedora              %{dist_version}
 %%__bootstrap         ~bootstrap
-%%dist                %%{!?distprefix0:%%{?distprefix}}%%{expand:%%{lua:for i=0,9999 do print("%%{?distprefix" .. i .."}") end}}.fc%{dist_version}%%{?with_bootstrap:%{__bootstrap}}
+%%dist                %%{!?distprefix0:%%{?distprefix}}%%{expand:%%{lua:for i=0,9999 do print("%%{?distprefix" .. i .."}") end}}.fc%%{fedora}%%{?with_bootstrap:%{__bootstrap}}
 %%fc%{dist_version}                1
 EOF
 
@@ -642,6 +642,9 @@ echo _DISABLED_ > %{buildroot}%{_prefix}/lib/variant
 
 
 %changelog
+* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 32-0.2
+- RPM macros: Redefining %%fedora now changes %%dist
+
 * Tue Aug 13 2019 Mohan Boddu <mboddu@bhujji.com> - 32-0.1
 - Setup for rawhide being F32
 - Disable zram-swap service (sgallagh)

diff --git a/90-default.preset b/90-default.preset
index 90ad507..a2e69f9 100644
--- a/90-default.preset
+++ b/90-default.preset
@@ -187,11 +187,6 @@ enable mcelog.service
 # https://bugzilla.redhat.com/show_bug.cgi?id=1312018
 enable opal-prd.service
 
-# virtlog.service is sometimes used by VMs started by libvirt.service
-# Enable virtlog.socket to have it socket activated
-# https://bugzilla.redhat.com/show_bug.cgi?id=1290357
-enable virtlogd.socket
-
 # lircd is the Linux Infrared Control daemon
 # Starting with version 0.9.4, it requires no manual configuration
 # https://bugzilla.redhat.com/show_bug.cgi?id=1340061