import boom-boot-1.0-1.el8

.boom-boot.metadata

@@ -1 +1 @@
-03a68ddf109a1c53f45cf62e7f72e48893b60658 SOURCES/boom-246b116.tar.gz
+2234a16cde5e1634b25834a9891061c01bec1f48 SOURCES/boom-1.0.tar.gz

.gitignore

@@ -1 +1 @@
-SOURCES/boom-246b116.tar.gz
+SOURCES/boom-1.0.tar.gz

SOURCES/0001-boom.command-replace-.-with-_-in-automatic-uname-pat.patch

@@ -0,0 +1,16 @@
+ boom/command.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/boom/command.py b/boom/command.py
+index a113c21..487b9bd 100644
+--- a/boom/command.py
++++ b/boom/command.py
+@@ -908,7 +908,7 @@ def _uname_heuristic(name, version_id):
+     }
+ 
+     if name in _name_to_uname:
+-        return "%s%s" % (_name_to_uname[name], version_id)
++        return "%s%s" % (_name_to_uname[name], version_id.replace(".", "_"))
+     return None
+ 
+ 

SOURCES/0002-boom.command-remove-duplicate-host-profile-argument.patch

@@ -0,0 +1,32 @@
+ boom/_boom.py   | 2 +-
+ boom/command.py | 4 +---
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/boom/_boom.py b/boom/_boom.py
+index 4a84b78..d8fff54 100644
+--- a/boom/_boom.py
++++ b/boom/_boom.py
+@@ -629,7 +629,7 @@ class Selection(object):
+                       os_version_id=args.os_version_id,
+                       os_options=args.os_options,
+                       os_uname_pattern=args.uname_pattern,
+-                      host_id=args.host_profile)
++                      host_id=args.host_id)
+ 
+         _log_debug("Initialised %s from arguments" % repr(s))
+         return s
+diff --git a/boom/command.py b/boom/command.py
+index 487b9bd..5a50f98 100644
+--- a/boom/command.py
++++ b/boom/command.py
+@@ -2787,9 +2787,7 @@ def main(args):
+                         help="Take os-release values from the running host",
+                         action="store_true")
+     parser.add_argument("-P", "--host-profile", metavar="PROFILE", type=str,
+-                        help="A boom host profile identifier")
+-    parser.add_argument("--host-id", metavar="HOSTID", type=str,
+-                        help="A host profile identifier")
++                        help="A boom host profile identifier", dest="host_id")
+     parser.add_argument("--host-name", metavar="HOSTNAME", type=str,
+                         help="The host name associated with a host profile")
+     parser.add_argument("-i", "--initrd", metavar="IMG", type=str,

SOURCES/0003-examples-Remove-dangling-symlinks-in-entries.patch

@@ -0,0 +1,22 @@
+ .../entries/611f38fd887d41dea7eb3403b2730a76-12ce4b8-4.1.1-100.fc24.conf | 1 -
+ .../entries/611f38fd887d41dea7eb3403b2730a76-f2ebf21-3.10-23.el7.conf    | 1 -
+ 2 files changed, 2 deletions(-)
+ delete mode 120000 examples/entries/611f38fd887d41dea7eb3403b2730a76-12ce4b8-4.1.1-100.fc24.conf
+ delete mode 120000 examples/entries/611f38fd887d41dea7eb3403b2730a76-f2ebf21-3.10-23.el7.conf
+
+diff --git a/examples/entries/611f38fd887d41dea7eb3403b2730a76-12ce4b8-4.1.1-100.fc24.conf b/examples/entries/611f38fd887d41dea7eb3403b2730a76-12ce4b8-4.1.1-100.fc24.conf
+deleted file mode 120000
+index 70b5b3f..0000000
+--- a/examples/entries/611f38fd887d41dea7eb3403b2730a76-12ce4b8-4.1.1-100.fc24.conf
++++ /dev/null
+@@ -1 +0,0 @@
+-../../tests/loader/entries/611f38fd887d41dea7eb3403b2730a76-12ce4b8-4.1.1-100.fc24.conf
+\ No newline at end of file
+diff --git a/examples/entries/611f38fd887d41dea7eb3403b2730a76-f2ebf21-3.10-23.el7.conf b/examples/entries/611f38fd887d41dea7eb3403b2730a76-f2ebf21-3.10-23.el7.conf
+deleted file mode 120000
+index 4a62f7d..0000000
+--- a/examples/entries/611f38fd887d41dea7eb3403b2730a76-f2ebf21-3.10-23.el7.conf
++++ /dev/null
+@@ -1 +0,0 @@
+-../../tests/loader/entries/611f38fd887d41dea7eb3403b2730a76-f2ebf21-3.10-23.el7.conf
+\ No newline at end of file

SOURCES/0004-etc-Remove-executable-permission-from-etc-default-bo.patch

@@ -0,0 +1,22 @@
+ etc/default/boom                                    | 0
+ tests/bootloader_configs/boom_off/etc/default/boom  | 0
+ tests/bootloader_configs/boom_on/etc/default/boom   | 0
+ tests/bootloader_configs/no_grub_d/etc/default/boom | 0
+ 4 files changed, 0 insertions(+), 0 deletions(-)
+ mode change 100755 => 100644 etc/default/boom
+ mode change 100755 => 100644 tests/bootloader_configs/boom_off/etc/default/boom
+ mode change 100755 => 100644 tests/bootloader_configs/boom_on/etc/default/boom
+ mode change 100755 => 100644 tests/bootloader_configs/no_grub_d/etc/default/boom
+
+diff --git a/etc/default/boom b/etc/default/boom
+old mode 100755
+new mode 100644
+diff --git a/tests/bootloader_configs/boom_off/etc/default/boom b/tests/bootloader_configs/boom_off/etc/default/boom
+old mode 100755
+new mode 100644
+diff --git a/tests/bootloader_configs/boom_on/etc/default/boom b/tests/bootloader_configs/boom_on/etc/default/boom
+old mode 100755
+new mode 100644
+diff --git a/tests/bootloader_configs/no_grub_d/etc/default/boom b/tests/bootloader_configs/no_grub_d/etc/default/boom
+old mode 100755
+new mode 100644

SOURCES/0005-man-Fix-line-starting-with.patch

@@ -0,0 +1,18 @@
+ man/man8/boom.8 | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/man/man8/boom.8 b/man/man8/boom.8
+index 28bad24..cfc736a 100644
+--- a/man/man8/boom.8
++++ b/man/man8/boom.8
+@@ -1114,8 +1114,8 @@ describing the properties of the configured host profiles.
+ 
+ The list of fields to display is given with \fB--options\fP as a comma
+ separated list of field names. To obtain a list of available fields run
+-'\fBboom host list -o help\fP'. If the list of fields begins with the
+-'\fB+\fP' character the specified fields are appended to the default
++\&'\fBboom host list -o help\fP'. If the list of fields begins with the
++\&'\fB+\fP' character the specified fields are appended to the default
+ field list. Otherwise the given list of fields replaces the default set
+ of report fields.
+ 

SPECS/boom-boot.spec

@@ -1,18 +1,20 @@
 %global summary A set of libraries and tools for managing boot loader entries
 %global sphinx_docs 1
 
-%global commit 246b116e58c1efd194707f71fe6e96243320d8bf
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-
 Name:		boom-boot
 Version:	1.0
-Release:	0.2.20190610git%{shortcommit}%{?dist}
+Release:	1%{?dist}
 Summary:	%{summary}
 
 License:	GPLv2
-URL:		https://github.com/bmr-cymru/boom
+URL:		https://github.com/snapshotmanager/boom
-Source0:	https://github.com/bmr-cymru/boom/archive/%{commit}/boom-%{shortcommit}.tar.gz
+Source0:	https://github.com/snapshotmanager/boom/archive/%{version}/boom-%{version}.tar.gz
-Patch0:         Disable-GRUB2-plugin-on-RHEL-8.patch
+Patch0:		Disable-GRUB2-plugin-on-RHEL-8.patch
+Patch1:		0001-boom.command-replace-.-with-_-in-automatic-uname-pat.patch
+Patch2:		0002-boom.command-remove-duplicate-host-profile-argument.patch
+Patch3:		0003-examples-Remove-dangling-symlinks-in-entries.patch
+Patch4:		0004-etc-Remove-executable-permission-from-etc-default-bo.patch
+Patch5:		0005-man-Fix-line-starting-with.patch
 
 BuildArch:	noarch
 
@@ -28,7 +30,7 @@ Requires: %{name}-conf = %{version}-%{release}
 %package -n python3-boom
 Summary: %{summary}
 # Unsupported on RHEL-8 :-(
-#%%{?python_provide:%%python_provide python%{__python_pkgversion}-boom}
+#%%{?python_provide:%%python_provide python%%{__python_pkgversion}-boom}
 # Do we need this??? IMO not
 #Provides: python3-boom = %%{version}-%%{release}
 Requires: %{__python3}
@@ -86,9 +88,14 @@ include this support in both Red Hat Enterprise Linux 7 and Fedora).
 This package provides integration scripts for grub2 bootloader.
 
 %prep
-%setup -n boom-%{commit}
+%setup -n boom-%{version}
 # NOTE: Do not use backup extension - MANIFEST.in is picking them
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 %if 0%{?sphinx_docs}
@@ -159,6 +166,9 @@ rm doc/conf.py
 
 
 %changelog
+* Fri Nov 29 2019 Marian Csontos <mcsontos@redhat.com> 1.0-1
+- Update to new upstream release 1.0.
+
 * Mon Jun 10 2019 Marian Csontos <mcsontos@redhat.com> 1.0-0.2.20190610git246b116
 - Fix packaging issues.