Attachment 842745 Details for Bug 1047066 – Install macros.dist as non-%config to %{_rpmconfigdir}/macros.d (#846679).

[patch] Install macros.dist as non-%config to %{_rpmconfigdir}/macros.d (#846679).

Install-macrosdist-as-non-config-to-rpmconfigdirma.patch (text/plain), 2.28 KB, created by Ville Skyttä on 2013-12-28 19:33:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2013-12-28 19:33:47 UTC

Size: 2.28 KB

patch

obsolete

>From 86f701993754b1d322d246545cf95d3ace5c6fe1 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
>Date: Sat, 28 Dec 2013 21:32:50 +0200
>Subject: [PATCH] Install macros.dist as non-%config to
> %{_rpmconfigdir}/macros.d (#846679).
>
>- Fix bogus date in %changelog.
>
>https://bugzilla.redhat.com/show_bug.cgi?id=1047066
>---
> fedora-release.spec | 14 +++++++++-----
> 1 file changed, 9 insertions(+), 5 deletions(-)
>
>diff --git a/fedora-release.spec b/fedora-release.spec
>index 1fcc216..9b808f2 100644
>--- a/fedora-release.spec
>+++ b/fedora-release.spec
>@@ -5,7 +5,7 @@
> Summary:        Fedora release files
> Name:           fedora-release
> Version:        21
>-Release:        0.2
>+Release:        0.3
> License:        GPLv2
> Group:          System Environment/Base
> URL:            http://fedoraproject.org
>@@ -90,8 +90,8 @@ for file in fedora*repo ; do
> done
> 
> # Set up the dist tag macros
>-install -d -m 755 $RPM_BUILD_ROOT/etc/rpm
>-cat >> $RPM_BUILD_ROOT/etc/rpm/macros.dist << EOF
>+install -d -m 755 $RPM_BUILD_ROOT%{_rpmconfigdir}/macros.d
>+cat >> $RPM_BUILD_ROOT%{_rpmconfigdir}/macros.d/macros.dist << EOF
> # dist macros.
> 
> %%fedora                %{dist_version}
>@@ -115,7 +115,7 @@ rm -rf $RPM_BUILD_ROOT
> %config(noreplace) /etc/yum.repos.d/fedora-updates*.repo
> %config(noreplace) %attr(0644,root,root) /etc/issue
> %config(noreplace) %attr(0644,root,root) /etc/issue.net
>-%config %attr(0644,root,root) /etc/rpm/macros.dist
>+%attr(0644,root,root) %{_rpmconfigdir}/macros.d/macros.dist
> %dir /etc/pki/rpm-gpg
> /etc/pki/rpm-gpg/*
> 
>@@ -124,6 +124,10 @@ rm -rf $RPM_BUILD_ROOT
> %config(noreplace) /etc/yum.repos.d/fedora-rawhide.repo
> 
> %changelog
>+* Sat Dec 28 2013 Ville SkyttÃ¤ <ville.skytta@iki.fi> - 21-0.3
>+- Install macros.dist as non-%%config to %%{_rpmconfigdir}/macros.d (#846679).
>+- Fix bogus date in %%changelog.
>+
> * Wed Nov 13 2013 Dennis Gilmore <dennis@ausil.us> - 21-0.2
> - remove f20 keys add f21
> - patch from Will Woods to use a archmap file for linking gpg keys
>@@ -314,7 +318,7 @@ rm -rf $RPM_BUILD_ROOT
> - Bump for F8 Test2
> - Fix license tag
> 
>-* Thu Jul 27 2007 Jesse Keating <jkeating@redhat.com> - 7.90-1
>+* Fri Jul 27 2007 Jesse Keating <jkeating@redhat.com> - 7.90-1
> - Bump for F8 Test1
> 
> * Thu Jun 28 2007 Jesse Keating <jkeating@redhat.com> - 7.89-3
>-- 
>1.8.3.1

Actions: View | Diff

Attachments on bug 1047066: 842745