From 7a576632911be26f2432f664151613a92b35db93 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Sat, 15 Dec 2018 21:34:01 +0000
Subject: Use 'release' instead of 'version' in settings.

This avoids confusion with the 'version' field found in the product.id
and urpmi.cfg files, which is just the base version number.
---
 examples/gui/config/build.cfg        | 6 +++---
 examples/gui/config/settings.cfg     | 2 +-
 examples/minimal/config/build.cfg    | 8 ++++----
 examples/minimal/config/settings.cfg | 2 +-
 examples/xfce/config/build.cfg       | 6 +++---
 examples/xfce/config/settings.cfg    | 2 +-
 lib/MGA/DrakISO/ClassicBuild.pm      | 2 +-
 lib/MGA/DrakISO/LiveBuild.pm         | 2 +-
 8 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/examples/gui/config/build.cfg b/examples/gui/config/build.cfg
index 94fae58..3aa0372 100644
--- a/examples/gui/config/build.cfg
+++ b/examples/gui/config/build.cfg
@@ -1,5 +1,5 @@
 my $distro          = $build->{settings}{distro};
-my $version         = $build->{settings}{version};
+my $release         = $build->{settings}{release};
 my $product         = $build->{settings}{product};
 my $desktop         = $build->{settings}{desktop};
 my $arch            = $build->{settings}{arch};
@@ -9,13 +9,13 @@ my @user_config_dirs = ('/etc/skel');
 sub build_label {
     my ($build) = @_;
 
-    join('-', $distro, $version, $product, $desktop, $arch);
+    join('-', $distro, $release, $product, $desktop, $arch);
 }
 
 sub build_title {
     my ($build) = @_;
 
-    join(' ', $distro, $version, $product, $desktop);
+    join(' ', $distro, $release, $product, $desktop);
 }
 
 my $default_append = 'root=mgalive:LABEL=' . build_label($build) . ' splash quiet noiswmd audit=0 rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0';
diff --git a/examples/gui/config/settings.cfg b/examples/gui/config/settings.cfg
index 0085504..e0a8b56 100644
--- a/examples/gui/config/settings.cfg
+++ b/examples/gui/config/settings.cfg
@@ -2,7 +2,7 @@ vendor=Custom
 distro=Mageia
 product=Live
 desktop=Custom
-version=7
+release=7
 arch=x86_64
 repository=http://mirrors.kernel.org/mageia/distrib/7
 workdir=
diff --git a/examples/minimal/config/build.cfg b/examples/minimal/config/build.cfg
index 7e7780d..c6d3d9c 100644
--- a/examples/minimal/config/build.cfg
+++ b/examples/minimal/config/build.cfg
@@ -1,5 +1,5 @@
 my $distro          = $build->{settings}{distro};
-my $version         = $build->{settings}{version};
+my $release         = $build->{settings}{release};
 my $product         = $build->{settings}{product};
 my $type            = $build->{settings}{type};
 my $arch            = $build->{settings}{arch};
@@ -10,19 +10,19 @@ my @user_config_dirs = ('/etc/skel', '/home/' . $default_user);
 sub build_label {
     my ($build) = @_;
 
-    join('-', $distro, $version, $product, $type, $arch);
+    join('-', $distro, $release, $product, $type, $arch);
 }
 
 sub build_title {
     my ($build) = @_;
 
-    join(' ', $distro, $version, $product, $type);
+    join(' ', $distro, $release, $product, $type);
 }
 
 my $default_append = 'root=mgalive:LABEL=' . build_label($build) . ' noiswmd audit=0 rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0';
 
 my $config = {
-    iso_name_fields => [ qw(distro version product type arch) ],
+    iso_name_fields => [ qw(distro release product type arch) ],
     system => {
         enabled_media => [
             'Core Release',
diff --git a/examples/minimal/config/settings.cfg b/examples/minimal/config/settings.cfg
index b4ee1b5..e37ae33 100644
--- a/examples/minimal/config/settings.cfg
+++ b/examples/minimal/config/settings.cfg
@@ -2,7 +2,7 @@ vendor=Custom
 distro=Mageia
 product=Live
 type=Minimal
-version=7
+release=7
 arch=x86_64
 region=all
 default_user=live
diff --git a/examples/xfce/config/build.cfg b/examples/xfce/config/build.cfg
index 1e9fc55..2749350 100644
--- a/examples/xfce/config/build.cfg
+++ b/examples/xfce/config/build.cfg
@@ -1,5 +1,5 @@
 my $distro          = $build->{settings}{distro};
-my $version         = $build->{settings}{version};
+my $release         = $build->{settings}{release};
 my $product         = $build->{settings}{product};
 my $desktop         = $build->{settings}{desktop};
 my $arch            = $build->{settings}{arch};
@@ -10,13 +10,13 @@ my @user_config_dirs = ('/etc/skel', '/home/' . $default_user);
 sub build_label {
     my ($build) = @_;
 
-    join('-', $distro, $version, $product, $desktop, $arch);
+    join('-', $distro, $release, $product, $desktop, $arch);
 }
 
 sub build_title {
     my ($build) = @_;
 
-    join(' ', $distro, $version, $product, $desktop);
+    join(' ', $distro, $release, $product, $desktop);
 }
 
 my $default_append = 'root=mgalive:LABEL=' . build_label($build) . ' splash quiet noiswmd audit=0 rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0';
diff --git a/examples/xfce/config/settings.cfg b/examples/xfce/config/settings.cfg
index 4318f8b..99d9ed0 100644
--- a/examples/xfce/config/settings.cfg
+++ b/examples/xfce/config/settings.cfg
@@ -2,7 +2,7 @@ vendor=Custom
 distro=Mageia
 product=Live
 desktop=Xfce
-version=7
+release=7
 arch=x86_64
 region=all
 default_user=live
diff --git a/lib/MGA/DrakISO/ClassicBuild.pm b/lib/MGA/DrakISO/ClassicBuild.pm
index eabcd85..c7afc28 100644
--- a/lib/MGA/DrakISO/ClassicBuild.pm
+++ b/lib/MGA/DrakISO/ClassicBuild.pm
@@ -40,7 +40,7 @@ sub new {
 }
 
 sub default_name_fields {
-    [ qw(distro version arch media) ];
+    [ qw(distro release arch media) ];
 }
 
 1;
diff --git a/lib/MGA/DrakISO/LiveBuild.pm b/lib/MGA/DrakISO/LiveBuild.pm
index d252947..824affc 100644
--- a/lib/MGA/DrakISO/LiveBuild.pm
+++ b/lib/MGA/DrakISO/LiveBuild.pm
@@ -41,7 +41,7 @@ sub new {
 
 sub default_name_fields {
     my ($build) = @_;
-    [ qw(distro version product desktop),
+    [ qw(distro release product desktop),
       if_($build->{settings}{region} ne 'all', $build->{settings}{region}),
       qw(arch media)
     ];
-- 
cgit v1.2.1