From fc96e27b5739f54775d25c178ca855e6220e6792 Mon Sep 17 00:00:00 2001
From: Jakub Kadlcik <frostyx@email.cz>
Date: Mon, 23 Nov 2020 00:05:30 +0100
Subject: [PATCH] Update modulemd-tools to 0.6-1

---
 .gitignore          |  1 +
 modulemd-tools.spec | 45 ++++++++++++++++++++++++++++++++++++++++++---
 sources             |  2 +-
 3 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2918e33..1aeb818 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /modulemd-tools-0.3.tar.gz
 /modulemd-tools-0.4.tar.gz
 /modulemd-tools-0.5.tar.gz
+/modulemd-tools-0.6.tar.gz
diff --git a/modulemd-tools.spec b/modulemd-tools.spec
index f820eb4..eca2b3c 100644
--- a/modulemd-tools.spec
+++ b/modulemd-tools.spec
@@ -1,5 +1,5 @@
 Name: modulemd-tools
-Version: 0.5
+Version: 0.6
 Release: 1%{?dist}
 Summary: Collection of tools for parsing and generating modulemd YAML files
 License: MIT
@@ -10,13 +10,19 @@ Source0: https://github.com/rpm-software-management/modulemd-tools/archive/%{ver
 
 BuildRequires: libmodulemd >= 2
 BuildRequires: createrepo_c
+BuildRequires: argparse-manpage
 BuildRequires: python3-devel
 BuildRequires: python3-setuptools
+BuildRequires: python3-gobject
 BuildRequires: python3-click
+%if ! 0%{?rhel}
+BuildRequires: python3-click-man
+%endif
 BuildRequires: python3-dnf
 BuildRequires: python3-hawkey
 BuildRequires: python3-createrepo_c
-BuildRequires: python3-gobject
+BuildRequires: python3-pyyaml
+BuildRequires: python3-parameterized
 
 Requires: libmodulemd >= 2
 Requires: createrepo_c
@@ -24,7 +30,7 @@ Requires: python3-click
 Requires: python3-dnf
 Requires: python3-hawkey
 Requires: python3-createrepo_c
-Requires: python3-gobject
+Requires: python3-pyyaml
 
 
 %description
@@ -44,6 +50,10 @@ createrepo_mod - A small wrapper around createrepo_c and modifyrepo_c to provide
 modulemd-merge - Merge several modules.yaml files into one. This is useful for
     example if you have several yum repositories and want to merge them into one.
 
+modulemd-generate-macros - 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.
+
 
 %prep
 %setup -q
@@ -52,6 +62,13 @@ modulemd-merge - Merge several modules.yaml files into one. This is useful for
 %build
 cd repo2module
 %py3_build
+cd ..
+
+# There is a missing python3-click-man package for EPEL8 and therefore we cannot
+# generate the manpages on the fly. They are temporarily commited into git repo.
+# Once RHBZ 1900423 gets resolved, just uncomment the following line. Please see
+# https://bugzilla.redhat.com/show_bug.cgi?id=1900423
+# PYTHONPATH=./modulemd_tools ./man/generate-manpages.sh
 
 
 %install
@@ -62,10 +79,19 @@ cd ..
 cp dir2module/dir2module.py %{buildroot}%{_bindir}/dir2module
 cp createrepo_mod/createrepo_mod.py %{buildroot}%{_bindir}/createrepo_mod
 cp modulemd-merge/modulemd-merge.py %{buildroot}%{_bindir}/modulemd-merge
+cp modulemd-generate-macros/modulemd-generate-macros.py \
+    %{buildroot}%{_bindir}/modulemd-generate-macros
+
+cp -r modulemd_tools/modulemd_tools %{buildroot}%{python3_sitelib}/modulemd_tools
+
+install -d %{buildroot}%{_mandir}/man1
+cp man/*.1 %{buildroot}%{_mandir}/man1/
 
 
 %check
 %{python3} repo2module/setup.py test
+cd modulemd_tools
+%{python3} -m unittest
 
 
 %files
@@ -77,9 +103,22 @@ cp modulemd-merge/modulemd-merge.py %{buildroot}%{_bindir}/modulemd-merge
 %{_bindir}/dir2module
 %{_bindir}/createrepo_mod
 %{_bindir}/modulemd-merge
+%{_bindir}/modulemd-generate-macros
+%{python3_sitelib}/modulemd_tools
+
+%{_mandir}/man1/repo2module.1*
+%{_mandir}/man1/dir2module.1*
+%{_mandir}/man1/createrepo_mod.1*
+%{_mandir}/man1/modulemd-merge.1*
+%{_mandir}/man1/modulemd-generate-macros.1.*
 
 
 %changelog
+* Sun Nov 22 2020 Jakub Kadlcik <frostyx@email.cz> 0.6-1
+- Generate manpages for all tools in this repository 
+- modulemd-generate-macros: add a tool for generating module-build-macros
+- modulemd_tools: add the first pieces of a python library (for internal usage only)
+
 * Thu Nov 05 2020 Jakub Kadlcik <frostyx@email.cz> 0.5-1
 - Release for epel8 as well (frostyx@email.cz)
 - Require createrepo_c for the createrepo_mod package (frostyx@email.cz)
diff --git a/sources b/sources
index 8191a8f..d057db3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (modulemd-tools-0.5.tar.gz) = f7e82d26e33605582783d3821c1432c407c32a99884c539a4e9e4d841f35572bc1ff573749e0927c06718ec3838dcb56b114d7111e89bb913ea0d278efd01bf3
+SHA512 (modulemd-tools-0.6.tar.gz) = 260c817fff9e58591f72b8ea700abe0b6462e2e5e0ae4e08db4dc4861a00f77100fae9f50f1a375bea29fab75d6298a874ae503526442617f4e00d7e90d368d4