Compare commits

...
Sign in to create a new pull request.

3 commits

Author SHA1 Message Date
Petr Písař
d5c9909c61 packit: Migrate from a deprecated current_version_command to actions/get-current-version
https://github.com/fedora-modularity/libmodulemd/issues/553
2023-05-11 14:52:33 +02:00
Petr Písař
3c83baf565 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.
2023-05-11 14:52:33 +02:00
Petr Písař
b6d1947147 2.15.0 bump 2023-05-10 16:33:09 +02:00
5 changed files with 24 additions and 17 deletions

2
.gitignore vendored
View file

@ -62,3 +62,5 @@
/modulemd-2.13.0.tar.xz.asc /modulemd-2.13.0.tar.xz.asc
/modulemd-2.14.0.tar.xz /modulemd-2.14.0.tar.xz
/modulemd-2.14.0.tar.xz.asc /modulemd-2.14.0.tar.xz.asc
/modulemd-2.15.0.tar.xz
/modulemd-2.15.0.tar.xz.asc

View file

@ -2,8 +2,9 @@ specfile_path: libmodulemd.spec
upstream_package_name: libmodulemd upstream_package_name: libmodulemd
downstream_package_name: libmodulemd downstream_package_name: libmodulemd
upstream_tag_template: libmodulemd-{version} upstream_tag_template: libmodulemd-{version}
current_version_command:
- ./.packit_version.sh actions:
get-current-version: ./.packit_version.sh
synced_files: synced_files:
- .packit.yml - .packit.yml

View file

@ -23,14 +23,14 @@
%endif %endif
Name: %{upstream_name}%{?v2_suffix} Name: %{upstream_name}%{?v2_suffix}
Version: 2.14.0 Version: 2.15.0
Release: 4%{?dist} Release: 2%{?dist}
Summary: Module metadata manipulation library Summary: Module metadata manipulation library
# COPYING: MIT # COPYING: MIT
## not in any binary package ## not in any binary package
# contrib/coverity-modeling.c: GPLv2+ # contrib/coverity-modeling.c: GPL-2.0-or-later
# contrib/release-tools/semver: GPLv3 # contrib/release-tools/semver: GPL-3.0-only
License: MIT License: MIT
URL: https://github.com/fedora-modularity/libmodulemd URL: https://github.com/fedora-modularity/libmodulemd
Source0: %{url}/releases/download/%{version}/modulemd-%{version}.tar.xz Source0: %{url}/releases/download/%{version}/modulemd-%{version}.tar.xz
@ -49,7 +49,6 @@ BuildRequires: pkgconfig(yaml-0.1)
BuildRequires: pkgconfig(gtk-doc) BuildRequires: pkgconfig(gtk-doc)
BuildRequires: glib2-doc BuildRequires: glib2-doc
BuildRequires: rpm-devel BuildRequires: rpm-devel
BuildRequires: file-devel
%if %{build_python2} %if %{build_python2}
BuildRequires: python2-devel BuildRequires: python2-devel
BuildRequires: python-gobject-base BuildRequires: python-gobject-base
@ -116,7 +115,6 @@ Development files for %{name}.
%build %build
%meson \ %meson \
%{meson_accept_overflowed_buildorder_flag} \ %{meson_accept_overflowed_buildorder_flag} \
-Dlibmagic=enabled \
-Drpmio=enabled \ -Drpmio=enabled \
-Dskip_introspection=false \ -Dskip_introspection=false \
-Dtest_installed_lib=false \ -Dtest_installed_lib=false \
@ -183,6 +181,12 @@ mv %{buildroot}%{_mandir}/man1/modulemd-validator.1 \
%changelog %changelog
* Wed May 10 2023 Petr Pisar <ppisar@redhat.com> - 2.15.0-2
- Adapt STI tests to current meson
* Wed May 10 2023 Petr Pisar <ppisar@redhat.com> - 2.15.0-1
- 2.15.0 bump
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.14.0-4 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.14.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

View file

@ -1,2 +1,2 @@
SHA512 (modulemd-2.14.0.tar.xz) = 90439cba83f4a8711095f1b9b92ba9135bade202703d698d192d066955ae8df3f53226fcd5fc73cd2873e5599822272f00a5b536cf62e3e51c37bbca32b7f756 SHA512 (modulemd-2.15.0.tar.xz) = 79032eb591cd3b778cb348040150ec4d1ccb8e2890d02c7b7a04f9b1bd376d32c5ae0e2c6dfb8056595fae5e54ea8365de06fe969a0f04b979abad3ff0882033
SHA512 (modulemd-2.14.0.tar.xz.asc) = a742c177084b2f1445704583ea43c09b479502432b62c1880ca4917dfa7550b6dfc3aef2498a5afdba61323451878b6ede7fdfba37d433982f0cc3925811668f SHA512 (modulemd-2.15.0.tar.xz.asc) = 07439efcd7d7ca1e67110a13902f2abd978c93872c383dcfde8d78accf9471787877d69fef8dc06ce65fbde3463b7e5201c7d550acbb530062d9990713d8c63a

View file

@ -1,17 +1,17 @@
--- ---
- hosts: localhost - hosts: localhost
tags: tags:
- classic - classic
roles: roles:
- role: standard-test-source - role: standard-test-source
- hosts: localhost - hosts: localhost
tags: tags:
- classic - classic
tasks: tasks:
- name: Make sure fedpkg and selinux bindings are installed - name: Make sure fedpkg and selinux bindings are installed
shell: dnf -y install fedpkg python{2,3}-libselinux libmodulemd-devel --skip-broken 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: copy:
src: "{{ playbook_dir }}/../libmodulemd.spec" src: "{{ playbook_dir }}/../libmodulemd.spec"
dest: /tmp/libmodulemd.spec dest: /tmp/libmodulemd.spec
@ -24,9 +24,9 @@
roles: roles:
- role: standard-test-basic - role: standard-test-basic
tests: 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: - build:
dir: . run: ninja -C /tmp/build
run: meson -Daccept_overflowed_buildorder=true -Dlibmagic=enabled -Drpmio=enabled -Dskip_introspection=false -Dtest_installed_lib=true -Dwith_py2=false -Dwith_py3=true source
- unittests: - unittests:
dir: . run: meson test -C /tmp/build
run: ninja test