Attachment 7124 Details for Bug 16963 – Patch to generate a dist.macros file and add to mageia-release-common

[patch] Patch to generate a dist.macros file and add to mageia-release-common

mageia-release-add-disttags.diff (text/plain), 1.11 KB, created by Neal Gompa on 2015-10-14 11:45:03 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Neal Gompa

Created: 2015-10-14 11:45:03 CEST

Size: 1.11 KB

patch

obsolete

>Index: SPECS/mageia-release.spec
>===================================================================
>--- SPECS/mageia-release.spec	(revision 890237)
>+++ SPECS/mageia-release.spec	(working copy)
>@@ -8,9 +8,10 @@
> %else
> %define distrib Official
> %endif
>-%define rel 0.1
>+%define rel 0.2
> %define distname cauldron
>-%define distsuffix .mga
>+%define distabbrv mga
>+%define distsuffix .%{distabbrv}
> %define distribution Mageia
> %define lc_distro %(echo %{distribution} | tr "A-Z" "a-z")
> 
>@@ -112,6 +113,13 @@
> %{product_id_base},product=%1\
> EOF\
>  \
>+mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d \
>+cat > %{buildroot}%{_rpmconfigdir}/macros.d/macros.dist << EOF \
>+%%dist              %{distsuffix}%{distro_release}\
>+%%%{lc_distro}            %{distro_release}\
>+%%%{distabbrv}%{distro_release}              1\
>+EOF\
>+\
> mkdir -p %{buildroot}%_sys_macros_dir \
> cat > %{buildroot}%_sys_macros_dir/%{1}.macros <<EOF \
> %%distribution      %distribution\
>@@ -251,6 +259,7 @@
> 
> %files common
> %doc CREDITS release-notes.*
>+%{_rpmconfigdir}/macros.d/macros.dist
> %{_prefix}/lib/os-release
> %{_sysconfdir}/*-release
> %{_sysconfdir}/release

Index: SPECS/mageia-release.spec
===================================================================
--- SPECS/mageia-release.spec	(revision 890237)
+++ SPECS/mageia-release.spec	(working copy)
@@ -8,9 +8,10 @@
 %else
 %define distrib Official
 %endif
-%define rel 0.1
+%define rel 0.2
 %define distname cauldron
-%define distsuffix .mga
+%define distabbrv mga
+%define distsuffix .%{distabbrv}
 %define distribution Mageia
 %define lc_distro %(echo %{distribution} | tr "A-Z" "a-z")
 
@@ -112,6 +113,13 @@
 %{product_id_base},product=%1\
 EOF\
  \
+mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d \
+cat > %{buildroot}%{_rpmconfigdir}/macros.d/macros.dist << EOF \
+%%dist              %{distsuffix}%{distro_release}\
+%%%{lc_distro}            %{distro_release}\
+%%%{distabbrv}%{distro_release}              1\
+EOF\
+\
 mkdir -p %{buildroot}%_sys_macros_dir \
 cat > %{buildroot}%_sys_macros_dir/%{1}.macros <<EOF \
 %%distribution      %distribution\
@@ -251,6 +259,7 @@
 
 %files common
 %doc CREDITS release-notes.*
+%{_rpmconfigdir}/macros.d/macros.dist
 %{_prefix}/lib/os-release
 %{_sysconfdir}/*-release
 %{_sysconfdir}/release

Actions: View | Diff

Attachments on bug 16963: 7124