Resolves: #1946984 - Update modulemd-tools to 0.9-1

.gitignore

@@ -6,3 +6,4 @@
 /modulemd-tools-0.6.tar.gz
 /modulemd-tools-0.7.tar.gz
 /modulemd-tools-0.8.tar.gz
+/modulemd-tools-0.9.tar.gz

modulemd-tools-0.8-Don-t-generate-manpages-on-the-fly.patch

@@ -1,232 +0,0 @@
-From 008a4704e4fb52f3911b138a3f6eec7b4c82d664 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Fri, 9 Apr 2021 12:14:47 +0200
-Subject: [PATCH] Don't generate manpages on the fly
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- man/createrepo_mod.1           | 21 +++++++++++++
- man/dir2module.1               | 55 ++++++++++++++++++++++++++++++++++
- man/modulemd-generate-macros.1 | 31 +++++++++++++++++++
- man/modulemd-merge.1           | 43 ++++++++++++++++++++++++++
- man/repo2module.1              | 27 +++++++++++++++++
- 5 files changed, 177 insertions(+)
- create mode 100644 man/createrepo_mod.1
- create mode 100644 man/dir2module.1
- create mode 100644 man/modulemd-generate-macros.1
- create mode 100644 man/modulemd-merge.1
- create mode 100644 man/repo2module.1
-
-diff --git a/man/createrepo_mod.1 b/man/createrepo_mod.1
-new file mode 100644
-index 0000000..9acdd7d
---- /dev/null
-+++ b/man/createrepo_mod.1
-@@ -0,0 +1,21 @@
-+.TH createrepo_mod "1" Manual
-+.SH NAME
-+createrepo_mod
-+.SH SYNOPSIS
-+.B createrepo_mod
-+[-h] directory_to_index
-+.SH DESCRIPTION
-+A small wrapper around createrepo_c and modifyrepo_c toprovide an easy tool
-+for generating module repositories
-+.SH OPTIONS
-+.TP
-+\fBdirectory_to_index\fR
-+Directory to index
-+
-+.SH AUTHORS
-+.B createrepo_mod
-+was written by Jakub Kadlčík <jkadlcik@redhat.com>.
-+.SH DISTRIBUTION
-+The latest version of createrepo_mod may be downloaded from
-+.UR HOMEPAGE
-+.UE
-diff --git a/man/dir2module.1 b/man/dir2module.1
-new file mode 100644
-index 0000000..728792e
---- /dev/null
-+++ b/man/dir2module.1
-@@ -0,0 +1,55 @@
-+.TH dir2module "1" Manual
-+.SH NAME
-+dir2module
-+.SH SYNOPSIS
-+.B dir2module
-+[-h] -m SUMMARY [-d DESCRIPTION] [-l LICENSE] [-r REQUIRES] [--force] [--stdout] (--dir DIR | --pkglist PKGLIST) nsvca
-+.SH DESCRIPTION
-+Recursively read RPMs from DIR or read them from specified pkglist.If any RPM
-+is missing on unreadable, error out.Populate artifacts/rpms with RPM
-+NEVRAs.Populate license/content with list of RPM licenses.Write
-+N:S:V:C:A.modulemd.yaml in the current directory.Make sure the yaml is in
-+modulemd v2 format.
-+.SH OPTIONS
-+.TP
-+\fBnsvca\fR
-+Module name, stream version, context and architecture in a N:S:V:C:A format
-+
-+.TP
-+\fB\-m\fR \fI\,SUMMARY\/\fR, \fB\-\-summary\fR \fI\,SUMMARY\/\fR
-+Module summary
-+
-+.TP
-+\fB\-d\fR \fI\,DESCRIPTION\/\fR, \fB\-\-description\fR \fI\,DESCRIPTION\/\fR
-+Module description
-+
-+.TP
-+\fB\-l\fR \fI\,LICENSE\/\fR, \fB\-\-license\fR \fI\,LICENSE\/\fR
-+Module license
-+
-+.TP
-+\fB\-r\fR \fI\,REQUIRES\/\fR, \fB\-\-requires\fR \fI\,REQUIRES\/\fR
-+Module runtime dependencies in a N:S format. For multiple dependencies, repeat
-+this option
-+
-+.TP
-+\fB\-\-force\fR
-+Suppress all constraints and hope for the best
-+
-+.TP
-+\fB\-\-stdout\fR
-+By defult the output is saved in a file. Use this to suppress it and print to
-+the STDOUT
-+
-+.TP
-+\fB\-\-dir\fR \fI\,DIR\/\fR
-+.TP
-+\fB\-\-pkglist\fR \fI\,PKGLIST\/\fR
-+
-+.SH AUTHORS
-+.B dir2module
-+was written by Jakub Kadlčík <jkadlcik@redhat.com>.
-+.SH DISTRIBUTION
-+The latest version of dir2module may be downloaded from
-+.UR HOMEPAGE
-+.UE
-diff --git a/man/modulemd-generate-macros.1 b/man/modulemd-generate-macros.1
-new file mode 100644
-index 0000000..36a1e9a
---- /dev/null
-+++ b/man/modulemd-generate-macros.1
-@@ -0,0 +1,31 @@
-+.TH modulemd-generate-macros "1" Manual
-+.SH NAME
-+modulemd-generate-macros
-+.SH SYNOPSIS
-+.B modulemd-generate-macros
-+[-h] [--disttag DISTTAG] [--conflicts-from-file CONFLICTS_FROM_FILE] yaml
-+.SH DESCRIPTION
-+Generate `module\-build\-macros` SRPM package, which is a central piece for
-+building modules. It should be present in the buildroot before any other
-+module packages are submitted to be built.
-+.SH OPTIONS
-+.TP
-+\fByaml\fR
-+Path to modulemd YAML file
-+
-+.TP
-+\fB\-\-disttag\fR \fI\,DISTTAG\/\fR
-+Disttag
-+
-+.TP
-+\fB\-\-conflicts\-from\-file\fR \fI\,CONFLICTS_FROM_FILE\/\fR
-+Path to a file containing conflicts definitions and their reasoning. Content
-+of this file gets simply pasted into the specfile
-+
-+.SH AUTHORS
-+.B modulemd\-generate\-macros
-+was written by Jakub Kadlčík <jkadlcik@redhat.com>.
-+.SH DISTRIBUTION
-+The latest version of modulemd\-generate\-macros may be downloaded from
-+.UR HOMEPAGE
-+.UE
-diff --git a/man/modulemd-merge.1 b/man/modulemd-merge.1
-new file mode 100644
-index 0000000..f2e89e3
---- /dev/null
-+++ b/man/modulemd-merge.1
-@@ -0,0 +1,43 @@
-+.TH modulemd-merge "1" Manual
-+.SH NAME
-+modulemd-merge
-+.SH SYNOPSIS
-+.B modulemd-merge
-+[-h] [-v] [-d] [-i] [-O] input [input ...] output
-+.SH DESCRIPTION
-+Merge several modules.yaml files (rpm modularity metadata) into one.
-+.SH OPTIONS
-+.TP
-+\fBinput\fR
-+input filename(s) or directories.
-+repomd.xml files are parsed and modules hrefs contained are merged.
-+If a directory is given, it is searched for repodata/repomd.xml
-+and repomd.xml
-+
-+.TP
-+\fBoutput\fR
-+YAML output filename
-+
-+.TP
-+\fB\-v\fR, \fB\-\-verbose\fR
-+increase output verbosity
-+
-+.TP
-+\fB\-d\fR, \fB\-\-debug\fR
-+debug output verbosity
-+
-+.TP
-+\fB\-i\fR, \fB\-\-ignore\-no\-input\fR
-+ignore non\-existing input files
-+
-+.TP
-+\fB\-O\fR, \fB\-\-to\-stdout\fR
-+print YAML output to stdout
-+
-+.SH AUTHORS
-+.B modulemd\-merge
-+was written by Gerd v. Egidy <gerd.von.egidy@intra2net.com>.
-+.SH DISTRIBUTION
-+The latest version of modulemd\-merge may be downloaded from
-+.UR HOMEPAGE
-+.UE
-diff --git a/man/repo2module.1 b/man/repo2module.1
-new file mode 100644
-index 0000000..111f7c2
---- /dev/null
-+++ b/man/repo2module.1
-@@ -0,0 +1,27 @@
-+.TH "REPO2MODULE" "1" "2021-04-06" "" "repo2module Manual"
-+.SH NAME
-+repo2module \- Generates modules.yaml file with a module,...
-+.SH SYNOPSIS
-+.B repo2module
-+[OPTIONS] REPO_PATH [MODULES_YAML]
-+.SH DESCRIPTION
-+Generates modules.yaml file with a module, that provides all RPM packages that are available within a repository.
-+.SH OPTIONS
-+.TP
-+\fB\-d,\fP \-\-debug / \-\-nodebug
-+.PP
-+.TP
-+\fB\-n,\fP \-\-module\-name TEXT
-+[default: (Current directory name)]
-+.TP
-+\fB\-s,\fP \-\-module\-stream TEXT
-+[default: rolling]
-+.TP
-+\fB\-v,\fP \-\-module\-version INTEGER
-+[default: 1]
-+.TP
-+\fB\-c,\fP \-\-module\-context TEXT
-+[default: abcdef12]
-+.TP
-+\fB\-O,\fP \-\-to\-stdout
-+.PP
--- 
-2.26.3
-

modulemd-tools.spec

@@ -1,5 +1,5 @@
 Name: modulemd-tools
-Version: 0.8
+Version: 0.9
 Release: 1%{?dist}
 Summary: Collection of tools for parsing and generating modulemd YAML files
 License: MIT
@@ -7,15 +7,12 @@ BuildArch: noarch
 
 URL: https://github.com/rpm-software-management/modulemd-tools
 Source0: https://github.com/rpm-software-management/modulemd-tools/archive/%{version}/%{name}-%{version}.tar.gz
-# Pregenerate manual pages because of missing python3-click-man, bug #1946984
-Patch0: modulemd-tools-0.8-Don-t-generate-manpages-on-the-fly.patch
 
 BuildRequires: createrepo_c
 BuildRequires: argparse-manpage
 BuildRequires: python3-devel
 BuildRequires: python3-setuptools
 BuildRequires: python3-libmodulemd >= 2.9.3
-BuildRequires: python3-click
 BuildRequires: python3-dnf
 BuildRequires: python3-hawkey
 BuildRequires: python3-createrepo_c
@@ -23,7 +20,6 @@ BuildRequires: python3-pyyaml
 BuildRequires: python3-pytest
 
 Requires: createrepo_c
-Requires: python3-click
 Requires: python3-dnf
 Requires: python3-hawkey
 Requires: python3-createrepo_c
@@ -55,7 +51,6 @@ modulemd-generate-macros - Generate module-build-macros SRPM package, which is
 
 %prep
 %setup -q
-%patch0 -p1
 
 
 %build
@@ -161,6 +156,9 @@ cd ..
 
 
 %changelog
+* Fri Apr 09 2021 Jakub Kadlcik <frostyx@email.cz> 0.9-1
+- repo2module: drop python-click dependency (frostyx@email.cz)
+
 * Tue Apr 06 2021 Jakub Kadlcik <frostyx@email.cz> 0.8-1
 - modulemd_tools: drop python3-parameterized dependency (frostyx@email.cz)
 - Package modulemd_tools helper lib (fvalder@redhat.com)

sources

@@ -1 +1 @@
-SHA512 (modulemd-tools-0.8.tar.gz) = f1a8229008b07b8c62312cf5610f75c5a964df1d78efe08a75f2d822762cf65d76dca210988ece11d16a7705cc451a06c85be25b38cc6a601ddac62abe5249c9
+SHA512 (modulemd-tools-0.9.tar.gz) = cf4c92f381933d0c57ecb79a95dcd66bfb19926e968bf304870284686a3120fe4a6c384f32bcc1548bd3b1179804ef9cb8c6ff5f5ae2f336eebc34aeead2a36d