From 8ffcd05e923e8c069c69556c738d579e71448c5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 22 Jul 2022 18:57:49 +0200 Subject: [PATCH 1/4] Update an out-dated URI in a description --- libmodulemd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libmodulemd.spec b/libmodulemd.spec index 018e4e9..cdd4587 100644 --- a/libmodulemd.spec +++ b/libmodulemd.spec @@ -62,7 +62,7 @@ BuildRequires: python%{python3_pkgversion}-gobject-base %description C library for manipulating module metadata files. -See https://github.com/fedora-modularity/libmodulemd/blob/master/README.md for +See https://github.com/fedora-modularity/libmodulemd/blob/main/README.md for more details. From 161de82968d82d678710e93cd648dd1317fd4394 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 10 May 2023 16:04:28 +0200 Subject: [PATCH 2/4] 2.15.0 bump --- .gitignore | 2 ++ libmodulemd.spec | 13 +++++++------ sources | 4 ++-- tests/tests.yml | 2 +- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 7077c03..6034ec3 100644 --- a/.gitignore +++ b/.gitignore @@ -62,3 +62,5 @@ /modulemd-2.13.0.tar.xz.asc /modulemd-2.14.0.tar.xz /modulemd-2.14.0.tar.xz.asc +/modulemd-2.15.0.tar.xz +/modulemd-2.15.0.tar.xz.asc diff --git a/libmodulemd.spec b/libmodulemd.spec index cdd4587..7b1df4b 100644 --- a/libmodulemd.spec +++ b/libmodulemd.spec @@ -23,14 +23,14 @@ %endif Name: %{upstream_name}%{?v2_suffix} -Version: 2.14.0 -Release: 2%{?dist} +Version: 2.15.0 +Release: 1%{?dist} Summary: Module metadata manipulation library # COPYING: MIT ## not in any binary package -# contrib/coverity-modeling.c: GPLv2+ -# contrib/release-tools/semver: GPLv3 +# contrib/coverity-modeling.c: GPL-2.0-or-later +# contrib/release-tools/semver: GPL-3.0-only License: MIT URL: https://github.com/fedora-modularity/libmodulemd Source0: %{url}/releases/download/%{version}/modulemd-%{version}.tar.xz @@ -49,7 +49,6 @@ BuildRequires: pkgconfig(yaml-0.1) BuildRequires: pkgconfig(gtk-doc) BuildRequires: glib2-doc BuildRequires: rpm-devel -BuildRequires: file-devel %if %{build_python2} BuildRequires: python2-devel BuildRequires: python-gobject-base @@ -116,7 +115,6 @@ Development files for %{name}. %build %meson \ %{meson_accept_overflowed_buildorder_flag} \ - -Dlibmagic=enabled \ -Drpmio=enabled \ -Dskip_introspection=false \ -Dtest_installed_lib=false \ @@ -183,6 +181,9 @@ mv %{buildroot}%{_mandir}/man1/modulemd-validator.1 \ %changelog +* Wed May 10 2023 Petr Pisar - 2.15.0-1 +- 2.15.0 bump + * Tue Feb 08 2022 Petr Pisar - 2.14.0-2 - Drop removed meson -D developer_build option from CI tests diff --git a/sources b/sources index 2a13e90..344f925 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (modulemd-2.14.0.tar.xz) = 90439cba83f4a8711095f1b9b92ba9135bade202703d698d192d066955ae8df3f53226fcd5fc73cd2873e5599822272f00a5b536cf62e3e51c37bbca32b7f756 -SHA512 (modulemd-2.14.0.tar.xz.asc) = a742c177084b2f1445704583ea43c09b479502432b62c1880ca4917dfa7550b6dfc3aef2498a5afdba61323451878b6ede7fdfba37d433982f0cc3925811668f +SHA512 (modulemd-2.15.0.tar.xz) = 79032eb591cd3b778cb348040150ec4d1ccb8e2890d02c7b7a04f9b1bd376d32c5ae0e2c6dfb8056595fae5e54ea8365de06fe969a0f04b979abad3ff0882033 +SHA512 (modulemd-2.15.0.tar.xz.asc) = 07439efcd7d7ca1e67110a13902f2abd978c93872c383dcfde8d78accf9471787877d69fef8dc06ce65fbde3463b7e5201c7d550acbb530062d9990713d8c63a diff --git a/tests/tests.yml b/tests/tests.yml index 9066e9b..0d73a2f 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -26,7 +26,7 @@ tests: - build: dir: . - run: meson -Daccept_overflowed_buildorder=true -Dlibmagic=enabled -Drpmio=enabled -Dskip_introspection=false -Dtest_installed_lib=true -Dwith_py2=false -Dwith_py3=true source + run: meson -Daccept_overflowed_buildorder=true -Drpmio=enabled -Dskip_introspection=false -Dtest_installed_lib=true -Dwith_py2=false -Dwith_py3=true source - unittests: dir: . run: ninja test From ffc724474fa5da436e69878f606481600246ec4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 10 May 2023 17:16:59 +0200 Subject: [PATCH 3/4] Adapt STI tests to current meson Meson now requires a build directory out of source tree. Setting STI dir to "{{ tenv_workdir }}source" does not work. It expands to "/var/str/var/str/source" instead of "var/str/source". Hence this patch passes to meson an explicit path to the directory with libmodulemd sources. --- libmodulemd.spec | 5 ++++- tests/tests.yml | 14 +++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/libmodulemd.spec b/libmodulemd.spec index 7b1df4b..2a3804b 100644 --- a/libmodulemd.spec +++ b/libmodulemd.spec @@ -24,7 +24,7 @@ Name: %{upstream_name}%{?v2_suffix} Version: 2.15.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Module metadata manipulation library # COPYING: MIT @@ -181,6 +181,9 @@ mv %{buildroot}%{_mandir}/man1/modulemd-validator.1 \ %changelog +* Wed May 10 2023 Petr Pisar - 2.15.0-2 +- Adapt STI tests to current meson + * Wed May 10 2023 Petr Pisar - 2.15.0-1 - 2.15.0 bump diff --git a/tests/tests.yml b/tests/tests.yml index 0d73a2f..d711be0 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -1,17 +1,17 @@ --- - hosts: localhost tags: - - classic + - classic roles: - role: standard-test-source - hosts: localhost tags: - - classic + - classic tasks: - name: Make sure fedpkg and selinux bindings are installed shell: dnf -y install fedpkg python{2,3}-libselinux libmodulemd-devel --skip-broken - - name: Copy spec file to remote machine + - name: Copy a spec file to /tmp copy: src: "{{ playbook_dir }}/../libmodulemd.spec" dest: /tmp/libmodulemd.spec @@ -24,9 +24,9 @@ roles: - role: standard-test-basic tests: + - configure: + run: meson setup -Daccept_overflowed_buildorder=true -Drpmio=enabled -Dskip_introspection=false -Dtest_installed_lib=true -Dwith_py2=false -Dwith_py3=true /tmp/build "{{ tenv_workdir }}source" - build: - dir: . - run: meson -Daccept_overflowed_buildorder=true -Drpmio=enabled -Dskip_introspection=false -Dtest_installed_lib=true -Dwith_py2=false -Dwith_py3=true source + run: ninja -C /tmp/build - unittests: - dir: . - run: ninja test + run: meson test -C /tmp/build From fd390f7379a1288a5933100e3682d825a9a4181f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Thu, 11 May 2023 09:14:11 +0200 Subject: [PATCH 4/4] packit: Migrate from a deprecated current_version_command to actions/get-current-version https://github.com/fedora-modularity/libmodulemd/issues/553 --- .packit.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.packit.yml b/.packit.yml index f445248..16c03ed 100644 --- a/.packit.yml +++ b/.packit.yml @@ -2,8 +2,9 @@ specfile_path: libmodulemd.spec upstream_package_name: libmodulemd downstream_package_name: libmodulemd upstream_tag_template: libmodulemd-{version} -current_version_command: - - ./.packit_version.sh + +actions: + get-current-version: ./.packit_version.sh synced_files: - .packit.yml