Attachment 1487022 Details for Bug 1632741 – Bump release to 4.3.0 and ship the missing macro file

[patch] Bump release to 4.3.0 and ship the missing macro file

0001-Update-to-4.3.0-0.patch (text/plain), 2.12 KB, created by Sandro Bonazzola on 2018-09-26 06:34:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sandro Bonazzola

Created: 2018-09-26 06:34:13 UTC

Size: 2.12 KB

patch

obsolete

>From 954f18930f8d1069718a2eed361b88431752598d Mon Sep 17 00:00:00 2001
>From: Sandro Bonazzola <sbonazzo@redhat.com>
>Date: Wed, 26 Sep 2018 08:29:01 +0200
>Subject: [PATCH] Update to 4.3.0-0 Ship /etc/rpm/macros.dist Resolves:
> BZ#1632741
>
>Signed-off-by: Sandro Bonazzola <sbonazzo@redhat.com>
>---
> redhat-release-virtualization-host.spec | 23 ++++++++++++++++++++---
> 1 file changed, 20 insertions(+), 3 deletions(-)
>
>diff --git a/redhat-release-virtualization-host.spec b/redhat-release-virtualization-host.spec
>index c0efdb3..eaf5a34 100644
>--- a/redhat-release-virtualization-host.spec
>+++ b/redhat-release-virtualization-host.spec
>@@ -17,9 +17,9 @@
> %define variant_titlecase Host
> %define variant_titlecase_concat Host
> %define variant_lowercase hypervisor
>-%define variant_full_release_version 4.2
>-%define variant_rhv_version 6
>-%define release_pkg_version %{variant_rhv_version}.1
>+%define variant_full_release_version 4.3
>+%define variant_rhv_version 0
>+%define release_pkg_version %{variant_rhv_version}.0
> 
> # initscripts conflicts with redhat-release < 7.5-0.11 so setting this to
> # latest available redhat-release
>@@ -150,6 +150,17 @@ echo OK
> # create /etc
> mkdir -p %{buildroot}/etc
> 
>+# set up the dist tag macros
>+install -d -m 755 %{buildroot}/etc/rpm
>+cat >> %{buildroot}/etc/rpm/macros.dist << EOF
>+# dist macros.
>+
>+%%rhel %{base_release_version}
>+%%dist %dist
>+%%el%{base_release_version} 1
>+EOF
>+
>+
> mkdir -p %{buildroot}/etc/pki/product-default
> cp %{SOURCE1} %{buildroot}/etc/pki/product-default/328.pem
> 
>@@ -295,6 +306,7 @@ sed -i -e "/def _check_NM/ s/$/\n        return/" \
> %config /etc/system-release-cpe
> %config /etc/redhat-release
> /etc/pki/rpm-gpg
>+/etc/rpm/macros.dist
> %{_datadir}/redhat-release-virtualization-host/EULA
> %{_sysconfdir}/pki/product-default/328.pem
> %{_prefix}/lib/systemd/system-preset/*
>@@ -308,6 +320,11 @@ sed -i -e "/def _check_NM/ s/$/\n        return/" \
> 
> 
> %changelog
>+* Wed Sep 26 2018 Sandro Bonazzola <sbonazzo@redhat.com> - 4.3.0-0
>+- Update to 4.3.0-0
>+- Ship /etc/rpm/macros.dist
>+- Resolves: BZ#1632741
>+
> * Fri Sep 07 2018 Yuval Turgeman <yturgema@redhat.com> - 4.2.6-1
> - Update to 4.2.6-1
> 
>-- 
>2.17.1
>

Actions: View | Diff

Attachments on bug 1632741: 1487022