rpms/modulemd-tools
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import modulemd-tools-0.7-6.el8

Browse Source
This commit is contained in:
CentOS Sources 2021-08-31 04:20:42 +00:00 committed by Stepan Oksanichenko
parent b1ef3a331c
commit b5064064b2
3 changed files with 9307 additions and 237 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

224
SOURCES/0001-Dont-generate-manpages-on-the-fly.patch
View File

@ -1,224 +0,0 @@
From c1668f6ca11562c12b6910ec8f399eb4e7e2cb3f Mon Sep 17 00:00:00 2001
From: Jakub Kadlcik <frostyx@email.cz>
Date: Tue, 9 Feb 2021 22:34:02 +0100
Subject: [PATCH] Dont generate manpages on the fly
---
man/createrepo_mod.1 | 21 +++++++++++++
man/dir2module.1 | 55 ++++++++++++++++++++++++++++++++++
man/modulemd-generate-macros.1 | 31 +++++++++++++++++++
man/modulemd-merge.1 | 39 ++++++++++++++++++++++++
man/repo2module.1 | 27 +++++++++++++++++
5 files changed, 173 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..3f280ff
--- /dev/null
+++ b/man/modulemd-merge.1
@@ -0,0 +1,39 @@
+.TH modulemd-merge "1" Manual
+.SH NAME
+modulemd-merge
+.SH SYNOPSIS
+.B modulemd-merge
+[-h] [-v] [-d] [-i] 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
+
+.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..bdc2aa8
--- /dev/null
+++ b/man/repo2module.1
@@ -0,0 +1,27 @@
+.TH "REPO2MODULE" "1" "2021-02-09" "" "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.29.2

9216
SOURCES/modulemd-tools-0.7-1-to-modulemd-tools-0.7-6.patch Normal file
View File

File diff suppressed because it is too large Load Diff

104
SPECS/modulemd-tools.spec
View File

@ -1,20 +1,18 @@
Name: modulemd-tools
Version: 0.7
Release: 4%{?dist}
Release: 6%{?dist}
Summary: Collection of tools for parsing and generating modulemd YAML files
License: MIT
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
Patch1: 0001-Dont-generate-manpages-on-the-fly.patch
Patch0: modulemd-tools-0.7-1-to-modulemd-tools-0.7-6.patch
BuildRequires: createrepo_c
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
@ -22,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
@ -51,10 +48,12 @@ 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.
bld2repo - Simple tool for dowloading build required RPMs of a modular build from koji.
%prep
%setup -q
%patch1 -p1
%patch0 -p1
%build
@ -66,6 +65,18 @@ cd dir2module
%py3_build
cd ..
cd createrepo_mod
%py3_build
cd ..
cd modulemd-merge
%py3_build
cd ..
cd modulemd_tools
%py3_build
cd ..
%install
cd repo2module
@ -76,24 +87,46 @@ cd dir2module
%py3_install
cd ..
cp createrepo_mod/createrepo_mod.py %{buildroot}%{_bindir}/createrepo_mod
cp modulemd-merge/modulemd-merge.py %{buildroot}%{_bindir}/modulemd-merge
cd createrepo_mod
%py3_install
cd ..
cd modulemd-merge
%py3_install
cd ..
cd modulemd_tools
%py3_install
cd ..
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
export PATH={buildroot}%{_bindir}:$PATH
cd repo2module
%{__python3} -m pytest
%{python3} -m pytest -vv
cd ..
cd dir2module
%{__python3} -m pytest
%{python3} -m pytest -vv
cd ..
cd createrepo_mod
%{python3} -m pytest -vv
cd ..
cd modulemd-merge
%{python3} -m pytest -vv -s
cd ..
cd modulemd_tools
%{python3} -m pytest -vv
cd ..
@ -104,21 +137,66 @@ cd ..
%{python3_sitelib}/repo2module-*.egg-info/
%{python3_sitelib}/dir2module
%{python3_sitelib}/dir2module-*.egg-info/
%{python3_sitelib}/createrepo_mod
%{python3_sitelib}/createrepo_mod-*.egg-info/
%{python3_sitelib}/modulemd_merge
%{python3_sitelib}/modulemd_merge-*.egg-info/
%{python3_sitelib}/modulemd_tools
%{python3_sitelib}/modulemd_tools-*.egg-info/
%{_bindir}/repo2module
%{_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.*
%{_mandir}/man1/bld2repo.1.*
%changelog
* Fri Aug 27 2021 Jakub Kadlcik <jkadlcik@redhat.com> 0.7-6
- Do not install bld2repo as RHEL8 doesn't have python3-koji
(jkadlcik@redhat.com)
- Drop the Patch1 and make the change directly in this repository
(jkadlcik@redhat.com)
- Use UpstreamBuilder instead of DistributionBuilder (jkadlcik@redhat.com)
- Skip some tests because they require binary files (jkadlcik@redhat.com)
* Thu Aug 26 2021 Jakub Kadlcik <jkadlcik@redhat.com> 0.7-5
- Update to new upstream version
* Mon Aug 23 2021 Jakub Kadlcik <frostyx@email.cz> 0.11-1
- modulemd_tools: compatibility for upgrade_ext on EPEL8 (frostyx@email.cz)
- modulemd_tools: compatibility for read_packager_string on EPEL8
(frostyx@email.cz)
- dir2module: generate also profiles and modulemd-defaults file
(frostyx@email.cz)
- modulemd_tools: use upgrade_ext instead of upgrade (frostyx@email.cz)
- modulemd_tools: use read_packager_string instead of read_string
(frostyx@email.cz)
- Add installation instructions (frostyx@email.cz)
- bld2repo: do not create empty repos when --result-dir is used
(kdudka@redhat.com)
- bld2repo: print status in a more intuitive format (kdudka@redhat.com)
- tito: stop releasing for Fedora 32 (frostyx@email.cz)
* Mon Jun 14 2021 Jakub Kadlcik <frostyx@email.cz> 0.10-1
- Added bld2repo (mcurlej@redhat.com)
* 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)
- Add modulemd-merge tests (fvalder@redhat.com)
- Add createrepo_mod tests (fvalder@redhat.com)
- Replace master in fedora releaser to rawhide (frostyx@email.cz)
* Tue Mar 02 2021 Jakub Kadlčík <jkadlcik@redhat.com> - 0.7-4
- Rebuild for 8.5.0