From 49d665eaa30ebfd85d57fac0d40ac0c674bac474 Mon Sep 17 00:00:00 2001
From: Jakub Kadlcik <frostyx@email.cz>
Date: Jul 29 2020 21:41:56 +0000
Subject: Update modulemd-tools to 0.3-1


---

diff --git a/.gitignore b/.gitignore
index 4c8ffe2..7033081 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /dir2module-0.1.tar.gz
 /modulemd-tools-0.1.tar.gz
+/modulemd-tools-0.3.tar.gz
diff --git a/README.md b/README.md
deleted file mode 100644
index 34f88fe..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# modulemd-tools
-
-The modulemd-tools package
\ No newline at end of file
diff --git a/modulemd-tools.spec b/modulemd-tools.spec
index 3d72fc5..b39a7a5 100644
--- a/modulemd-tools.spec
+++ b/modulemd-tools.spec
@@ -1,6 +1,6 @@
 Name: modulemd-tools
-Version: 0.1
-Release: 2%{?dist}
+Version: 0.3
+Release: 1%{?dist}
 Summary: Collection of tools for parsing and generating modulemd YAML files
 License: MIT
 BuildArch: noarch
@@ -8,9 +8,6 @@ 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
 
-# Source1 is a temporary thing until we merge it with modulemd-tools upstream
-Source1: https://github.com/FrostyX/dir2module/archive/v0.1/dir2module-0.1.tar.gz
-
 BuildRequires: python3-devel
 BuildRequires: python3-click
 BuildRequires: python3-dnf
@@ -36,23 +33,34 @@ dir2module - Generates a module YAML definition based on essential module
     the module are found in a specified directory or a text file containing
     their list.
 
+createrepo_mod - A small wrapper around createrepo_c and modifyrepo_c to provide
+    an easy tool for generating module repositories.
+
+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.
+
 
 %prep
 %setup -q
-%setup -T -D -a 1
 
 
 %build
+cd repo2module
 %py3_build
 
 
 %install
+cd repo2module
 %py3_install
-cp dir2module-0.1/dir2module.py %{buildroot}%{_bindir}/dir2module
+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
 
 
 %check
-%{python3} setup.py test
+%{python3} repo2module/setup.py test
 
 
 %files
@@ -62,11 +70,18 @@ cp dir2module-0.1/dir2module.py %{buildroot}%{_bindir}/dir2module
 %{python3_sitelib}/repo2module-*.egg-info/
 %{_bindir}/repo2module
 %{_bindir}/dir2module
+%{_bindir}/createrepo_mod
+%{_bindir}/modulemd-merge
 
 
 %changelog
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+* Wed Jul 29 2020 Jakub Kadlcik <frostyx@email.cz> 0.3-1
+- Add createrepo_mod and modulemd-merge scripts
+
+* Sun Jul 26 2020 Jakub Kadlčík <jkadlcik@redhat.com> - 0.2-1
+- Add createrepo_mod tool
+- Add modulemd-merge tool
+- Drop Source1, it is not needed anymore
 
 * Tue Jun 09 2020 Jakub Kadlčík <jkadlcik@redhat.com> - 0.1-1
 - Initial package
diff --git a/sources b/sources
index 64246ff..db80a7f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (dir2module-0.1.tar.gz) = 5aa33887a208b88b0229f5a4bb99e3976e0fa5c74cd887903e773acd18f3c185251b9e0e6f825ab7ff92a9f37937b6c50339d779a3434a4c27fd7ad5e6889875
-SHA512 (modulemd-tools-0.1.tar.gz) = 99e3341811be1b31ffa49e203b62f7cdc83ee29c221ff5783b6528fb10a38c674e48771bfbe6c88b9e84f0dbe75172e48ec781c658d6a4904b45d2286a170f95
+SHA512 (modulemd-tools-0.3.tar.gz) = dda74635cfcb1a55e27533e247540cfc92aed1dd46d4a3ae33b2f3d306ffd51303e105250ca62a9a03d9a817a43fd4d835ff27b09523fdbcc600ca2f36411e78