From ecd79bdb085ba469f0dcb62fd0a0d7c767af6867ef22af895aa252289db3863e Mon Sep 17 00:00:00 2001
From: Steffen Winterfeldt <snwint@suse.com>
Date: Fri, 2 Jun 2023 10:57:51 +0000
Subject: [PATCH] - release 6.2

OBS-URL: https://build.opensuse.org/package/show/system:install:head/checkmedia?expand=0&rev=74
---
 checkmedia-6.1.tar.xz |  3 ---
 checkmedia-6.2.tar.xz |  3 +++
 checkmedia.changes    | 11 +++++++++++
 checkmedia.spec       | 24 +++++++++++++++---------
 4 files changed, 29 insertions(+), 12 deletions(-)
 delete mode 100644 checkmedia-6.1.tar.xz
 create mode 100644 checkmedia-6.2.tar.xz

diff --git a/checkmedia-6.1.tar.xz b/checkmedia-6.1.tar.xz
deleted file mode 100644
index 475a9b7..0000000
--- a/checkmedia-6.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:737cbf20fc436c91dcca04b1256c06e5c492fd4cd2e92234cb749b70f199be77
-size 58884
diff --git a/checkmedia-6.2.tar.xz b/checkmedia-6.2.tar.xz
new file mode 100644
index 0000000..485996a
--- /dev/null
+++ b/checkmedia-6.2.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:52852d52489b3ce14941f44da259b96012974edd4fb0979393501e1bd00fb73e
+size 61712
diff --git a/checkmedia.changes b/checkmedia.changes
index 9e7bfbc..a704ca5 100644
--- a/checkmedia.changes
+++ b/checkmedia.changes
@@ -1,3 +1,14 @@
+--------------------------------------------------------------------
+Fri Jun 2 10:57:02 UTC 2023 - wfeldt@opensuse.org
+
+- merge gh#openSUSE/checkmedia#17
+- do not select EFI System Partition for digest calculation
+  (bsc#1211953)
+- use default for SKIPSECTORS only for RH media
+- add man pages for checkmedia and tagmedia
+- add spec file for OBS
+- 6.2
+
 -------------------------------------------------------------------
 Tue Nov  9 13:24:34 UTC 2021 - Steffen Winterfeldt <snwint@suse.com>
 
diff --git a/checkmedia.spec b/checkmedia.spec
index 5275b61..40f5f9c 100644
--- a/checkmedia.spec
+++ b/checkmedia.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package checkmedia
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,37 +17,38 @@
 
 
 Name:           checkmedia
-Summary:        Check SUSE installation media
+Summary:        Check installation or Live media
 License:        GPL-3.0-or-later
 Group:          System/Management
-Version:        6.1
+Version:        6.2
 Release:        0
 URL:            https://github.com/openSUSE/checkmedia
 Source:         %{name}-%{version}.tar.xz
 BuildRequires:  gpg
 BuildRequires:  xz
+BuildRequires:  rubygem(asciidoctor)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
-The program checks SUSE installation media for errors.
+The program checks installation or Live media for errors.
 
 %define libversion %(echo %version | cut -d. -f1)
 
 %package -n     libmediacheck%{libversion}
-Summary:        Library for checking SUSE installation media
+Summary:        Library for checking installation or Live media
 Group:          System/Libraries
 Requires:       gpg
 
 %description -n libmediacheck%{libversion}
-Library for checking SUSE installation media. Used by checkmedia and linuxrc.
+Library for checking installation or Live media. Used by checkmedia and linuxrc.
 
 %package -n     libmediacheck-devel
-Summary:        Library for checking SUSE installation media
+Summary:        Library for checking installation or Live media
 Group:          Development/Libraries/C and C++
 Requires:       libmediacheck%{libversion} = %version
 
 %description -n libmediacheck-devel
-Library for checking SUSE installation media. Used by checkmedia and linuxrc.
+Library for checking installation or Live media. Used by checkmedia and linuxrc.
 
 %prep
 %setup
@@ -61,6 +62,9 @@ make test
 %install
 install -d -m 755 %{buildroot}/usr/bin
 %make_install
+make doc
+install -D -m 644 checkmedia.1 %{buildroot}%{_mandir}/man1/checkmedia.1
+install -D -m 644 tagmedia.1 %{buildroot}%{_mandir}/man1/tagmedia.1
 
 %post -n libmediacheck%{libversion} -p /sbin/ldconfig
 
@@ -70,11 +74,13 @@ install -d -m 755 %{buildroot}/usr/bin
 %defattr(-,root,root)
 /usr/bin/checkmedia
 /usr/bin/tagmedia
+%doc %{_mandir}/man1/checkmedia.*
+%doc %{_mandir}/man1/tagmedia.*
 
 %files -n libmediacheck%{libversion}
 %defattr(-,root,root)
 %{_libdir}/*.so.*
-%doc README.adoc
+%doc README.*
 %doc mediacheck.md
 %if 0%{?suse_version} >= 1500
 %license COPYING