From 9c684eb24254055b70f076b619ab6d45c58cea09 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Fri, 14 Feb 2020 12:44:58 -0500 Subject: [PATCH 1/6] [packit] 2.9.1 upstream release Upstream tag: libmodulemd-2.9.1 Upstream commit: b78d1baa Signed-off-by: Stephen Gallagher --- .gitignore | 1 + .make_packit_specfile.sh | 2 +- libmodulemd.spec | 5 ++++- sources | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1a174ad..19b06bc 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ /modulemd-2.8.2.tar.xz /modulemd-2.8.3.tar.xz /modulemd-2.9.0.tar.xz +/modulemd-2.9.1.tar.xz diff --git a/.make_packit_specfile.sh b/.make_packit_specfile.sh index bef12c9..092c9d0 100755 --- a/.make_packit_specfile.sh +++ b/.make_packit_specfile.sh @@ -15,7 +15,7 @@ hash=$(echo $version_desc | cut -d '-' -f4) if [ x$patch_count != x ]; then release=0.${date}.${patch_count}git${hash}%{?dist} else - release=0.${date}%{?dist} + release=1%{?dist} fi ./spec_tmpl.sh version=$version release=$release template=libmodulemd.spec.in > libmodulemd.spec diff --git a/libmodulemd.spec b/libmodulemd.spec index 334bfe5..967055a 100644 --- a/libmodulemd.spec +++ b/libmodulemd.spec @@ -8,7 +8,7 @@ %endif Name: libmodulemd -Version: 2.9.0 +Version: 2.9.1 Release: 1%{?dist} Summary: Module metadata manipulation library @@ -163,6 +163,9 @@ mv %{buildroot}%{_bindir}/modulemd-validator \ %changelog +* Fri Feb 14 2020 Stephen Gallagher - 2.9.1-1 +- new upstream release: 2.9.1 + * Wed Feb 12 2020 Stephen Gallagher - 2.9.0-1 - new upstream release: 2.9.0 diff --git a/sources b/sources index 01d47e2..ff18530 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (modulemd-2.9.0.tar.xz) = ef44829b078f1a7ce807edbd043b9964005765c36ff0d7f896d85c7850a02c1414844a60d96ca6fa45efa064407cf62d417fa9100455e656327322f06b814759 +SHA512 (modulemd-2.9.1.tar.xz) = 9f32bcea4f020edc4bc3de747c4cd588efc80a28922b075185907289bfd88d7436717908594b0709c04ae5dc578b0097591c7fb0f61acad32f4f56e74b3bc375 From 62fcc47ae7c38d1c8467754f02e7db71438a37c1 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Wed, 11 Mar 2020 16:37:11 -0400 Subject: [PATCH 2/6] [packit] 2.9.2 upstream release Upstream tag: libmodulemd-2.9.2 Upstream commit: 780750ea Signed-off-by: Stephen Gallagher --- .gitignore | 1 + .packit.yml | 4 +++- libmodulemd.spec | 51 ++++++++++++++++++++++++++++++++---------------- sources | 2 +- 4 files changed, 39 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 19b06bc..f709060 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ /modulemd-2.8.3.tar.xz /modulemd-2.9.0.tar.xz /modulemd-2.9.1.tar.xz +/modulemd-2.9.2.tar.xz diff --git a/.packit.yml b/.packit.yml index 7514322..f445248 100644 --- a/.packit.yml +++ b/.packit.yml @@ -17,7 +17,9 @@ jobs: - job: copr_build trigger: pull_request metadata: - targets: fedora-all + targets: + - fedora-all + - epel-7 - job: propose_downstream trigger: release diff --git a/libmodulemd.spec b/libmodulemd.spec index 967055a..c0da9c6 100644 --- a/libmodulemd.spec +++ b/libmodulemd.spec @@ -7,14 +7,20 @@ %global build_python2 0 %endif -Name: libmodulemd -Version: 2.9.1 -Release: 1%{?dist} +%global upstream_name libmodulemd + +%if (0%{?rhel} && 0%{?rhel} <= 7) + %global v2_suffix 2 +%endif + +Name: %{upstream_name}%{?v2_suffix} +Version: 2.9.2 +Release: 0.20200311.1gitg31bbd4e%{?dist} Summary: Module metadata manipulation library License: MIT URL: https://github.com/fedora-modularity/libmodulemd -Source0: %{url}/releases/download/%{name}-%{version}/modulemd-%{version}.tar.xz +Source0: %{url}/releases/download/%{upstream_name}-%{version}/modulemd-%{version}.tar.xz BuildRequires: meson >= 0.47 BuildRequires: pkgconfig @@ -31,13 +37,14 @@ BuildRequires: file-devel BuildRequires: python2-devel BuildRequires: python-gobject-base %endif -BuildRequires: python3-devel -BuildRequires: python3-gobject-base +BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: python%{python3_pkgversion}-gobject-base %ifarch %{valgrind_arches} BuildRequires: valgrind %endif BuildRequires: help2man + # Patches @@ -53,7 +60,6 @@ Summary: Python 2 bindings for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} Requires: python-gobject-base Requires: python-six -Obsoletes: python2-modulemd < 1.3.4 %description -n python2-%{name} Python 2 bindings for %{name} @@ -64,8 +70,13 @@ Python 2 bindings for %{name} Summary: Python 3 bindings for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} Requires: python%{python3_pkgversion}-gobject-base + +%if (0%{?rhel} && 0%{?rhel} <= 7) +# The py3_dist macro on EPEL 7 doesn't work right at the moment +Requires: python3.6dist(six) +%else Requires: %{py3_dist six} -Obsoletes: python%{python3_pkgversion}-modulemd < 1.3.4 +%endif %description -n python%{python3_pkgversion}-%{name} Python %{python3_pkgversion} bindings for %{name} @@ -74,6 +85,10 @@ Python %{python3_pkgversion} bindings for %{name} %package devel Summary: Development files for libmodulemd Requires: %{name}%{?_isa} = %{version}-%{release} +%if (0%{?rhel} && 0%{?rhel} <= 7) +Conflicts: libmodulemd1-devel +Conflicts: libmodulemd-devel +%endif %description devel @@ -120,7 +135,10 @@ export MMD_SKIP_VALGRIND=1 # Don't conflict with modulemd-validator from 1.x included in the official # RHEL 7 repos mv %{buildroot}%{_bindir}/modulemd-validator \ - %{buildroot}%{_bindir}/modulemd-validator2 + %{buildroot}%{_bindir}/modulemd-validator%{?v2_suffix} + +mv %{buildroot}%{_mandir}/man1/modulemd-validator.1 \ + %{buildroot}%{_mandir}/man1/modulemd-validator%{?v2_suffix}.1 %endif @@ -130,19 +148,15 @@ mv %{buildroot}%{_bindir}/modulemd-validator \ %files %license COPYING %doc README.md -%if ( 0%{?rhel} && 0%{?rhel} <= 7) -%{_bindir}/modulemd-validator2 -%else -%{_bindir}/modulemd-validator -%endif -%{_mandir}/man1/modulemd-validator.1* -%{_libdir}/%{name}.so.2* +%{_bindir}/modulemd-validator%{?v2_suffix} +%{_mandir}/man1/modulemd-validator%{?v2_suffix}.1* +%{_libdir}/%{upstream_name}.so.2* %dir %{_libdir}/girepository-1.0 %{_libdir}/girepository-1.0/Modulemd-2.0.typelib %files devel -%{_libdir}/%{name}.so +%{_libdir}/%{upstream_name}.so %{_libdir}/pkgconfig/modulemd-2.0.pc %{_includedir}/modulemd-2.0/ %dir %{_datadir}/gir-1.0 @@ -163,6 +177,9 @@ mv %{buildroot}%{_bindir}/modulemd-validator \ %changelog +* Wed Mar 11 2020 Stephen Gallagher - 2.9.2-0.20200311.1gitg31bbd4e +- new upstream release: 2.9.2 + * Fri Feb 14 2020 Stephen Gallagher - 2.9.1-1 - new upstream release: 2.9.1 diff --git a/sources b/sources index ff18530..6c76530 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (modulemd-2.9.1.tar.xz) = 9f32bcea4f020edc4bc3de747c4cd588efc80a28922b075185907289bfd88d7436717908594b0709c04ae5dc578b0097591c7fb0f61acad32f4f56e74b3bc375 +SHA512 (modulemd-2.9.2.tar.xz) = 7605f5d0f90a4af0ca2b40a90a5701c71d5ee4c4e276433f440670102100809b2d026c8c676f11adf2b0d50201df5caf326e464b6f4f3c139cb62bc711f3ee28 From 0a96446f9de6d3fa7a07b7df3fffdec0e19a94dc Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Wed, 11 Mar 2020 16:43:46 -0400 Subject: [PATCH 3/6] [packit] 2.9.2 upstream release Upstream tag: libmodulemd-2.9.2 Upstream commit: 780750ea Signed-off-by: Stephen Gallagher --- libmodulemd.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libmodulemd.spec b/libmodulemd.spec index c0da9c6..c00310f 100644 --- a/libmodulemd.spec +++ b/libmodulemd.spec @@ -180,6 +180,9 @@ mv %{buildroot}%{_mandir}/man1/modulemd-validator.1 \ * Wed Mar 11 2020 Stephen Gallagher - 2.9.2-0.20200311.1gitg31bbd4e - new upstream release: 2.9.2 +* Wed Mar 11 2020 Stephen Gallagher - 2.9.2-0.20200311.1gitg31bbd4e +- new upstream release: 2.9.2 + * Fri Feb 14 2020 Stephen Gallagher - 2.9.1-1 - new upstream release: 2.9.1 From bf8cb9179dd6f381823ab248e0e113569ae66f6f Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Wed, 11 Mar 2020 16:47:21 -0400 Subject: [PATCH 4/6] [packit] 2.9.2 upstream release Upstream tag: libmodulemd-2.9.2 Upstream commit: 780750ea Signed-off-by: Stephen Gallagher --- libmodulemd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmodulemd.spec b/libmodulemd.spec index c00310f..4ad1d65 100644 --- a/libmodulemd.spec +++ b/libmodulemd.spec @@ -15,7 +15,7 @@ Name: %{upstream_name}%{?v2_suffix} Version: 2.9.2 -Release: 0.20200311.1gitg31bbd4e%{?dist} +Release: 1%{?dist} Summary: Module metadata manipulation library License: MIT @@ -177,6 +177,9 @@ mv %{buildroot}%{_mandir}/man1/modulemd-validator.1 \ %changelog +* Wed Mar 11 2020 Stephen Gallagher - 2.9.2-1 +- new upstream release: 2.9.2 + * Wed Mar 11 2020 Stephen Gallagher - 2.9.2-0.20200311.1gitg31bbd4e - new upstream release: 2.9.2 From 7ce0f131c40eecd678d38356f1c73e8b433c7282 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Mon, 3 May 2021 15:50:48 +0200 Subject: [PATCH 5/6] 2.12.1 bump --- .gitignore | 2 ++ ...-E3F42FCE156830A80358E6E94FD1AEC3365AF7BF.gpg | Bin 0 -> 2895 bytes libmodulemd.spec | 9 ++++++++- sources | 3 ++- 4 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 gpgkey-E3F42FCE156830A80358E6E94FD1AEC3365AF7BF.gpg diff --git a/.gitignore b/.gitignore index fc15bef..3dc62ef 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,5 @@ /modulemd-2.11.1.tar.xz /modulemd-2.11.2.tar.xz /modulemd-2.12.0.tar.xz +/modulemd-2.12.1.tar.xz +/modulemd-2.12.1.tar.xz.asc diff --git a/gpgkey-E3F42FCE156830A80358E6E94FD1AEC3365AF7BF.gpg b/gpgkey-E3F42FCE156830A80358E6E94FD1AEC3365AF7BF.gpg new file mode 100644 index 0000000000000000000000000000000000000000..3cbbce4a35934919221753bbf487140def1ea837 GIT binary patch literal 2895 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 0.47 BuildRequires: pkgconfig BuildRequires: gcc @@ -92,6 +95,7 @@ Development files for libmodulemd. %prep +%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %autosetup -p1 -n modulemd-%{version} @@ -163,6 +167,9 @@ mv %{buildroot}%{_mandir}/man1/modulemd-validator.1 \ %changelog +* Mon May 03 2021 Petr Pisar - 2.12.1-1 +- 2.12.1 bump + * Thu Jan 14 2021 Stephen Gallagher - 2.12.0-1 - Add support for 'buildorder' to Packager documents diff --git a/sources b/sources index 2ae70ad..9e0fc7c 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (modulemd-2.12.0.tar.xz) = 8dda8bf92a0e1ad4578bf15099443bc1ef42b4a0609a635b2e7a885c878994ce64c1670ffb75ab566ac6ce08f87e0b2807149d08fe3b701abd0ef4a4a9569f88 +SHA512 (modulemd-2.12.1.tar.xz) = 2bd4242f0f1aea561a5b899678237f7390652987e02c46652b72eadebde60d7cfb82d93e0a720e3c070261a7449245b9319b9fd755aba1c6f354660a959373b3 +SHA512 (modulemd-2.12.1.tar.xz.asc) = 072141c83a991ac7f1177d2e3ccf2b050c2d644453c5e815ad826b8fe4a994954d0754c9da5279727ccc74f182c193f89d5f227ff0580b0a8ab3e730ab52b287 From 43cc64cc469ac5d44fde6877d7e8c15fefe4fb0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Thu, 6 May 2021 13:27:49 +0200 Subject: [PATCH 6/6] Correct source addresses 2.12.1 was released from "2.12.1" tag. Also document a source of the PGP keyring as required by the packaging guidelines. --- libmodulemd.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libmodulemd.spec b/libmodulemd.spec index 7b76475..c89e9a9 100644 --- a/libmodulemd.spec +++ b/libmodulemd.spec @@ -19,8 +19,9 @@ Summary: Module metadata manipulation library License: MIT URL: https://github.com/fedora-modularity/libmodulemd -Source0: %{url}/releases/download/%{upstream_name}-%{version}/modulemd-%{version}.tar.xz -Source1: %{url}/releases/download/%{upstream_name}-%{version}/modulemd-%{version}.tar.xz.asc +Source0: %{url}/releases/download/%{version}/modulemd-%{version}.tar.xz +Source1: %{url}/releases/download/%{version}/modulemd-%{version}.tar.xz.asc +# Key exported from Petr Pisar's keyring Source2: gpgkey-E3F42FCE156830A80358E6E94FD1AEC3365AF7BF.gpg BuildRequires: gnupg2