2.13.0 bump

This commit is contained in:
Petr Písař 2021-07-09 13:28:12 +02:00
parent 7bc296f67b
commit f5554ca436
3 changed files with 42 additions and 30 deletions

2
.gitignore vendored
View File

@ -58,3 +58,5 @@
/modulemd-2.12.0.tar.xz /modulemd-2.12.0.tar.xz
/modulemd-2.12.1.tar.xz /modulemd-2.12.1.tar.xz
/modulemd-2.12.1.tar.xz.asc /modulemd-2.12.1.tar.xz.asc
/modulemd-2.13.0.tar.xz
/modulemd-2.13.0.tar.xz.asc

View File

@ -1,9 +1,12 @@
%if 0%{?rhel} && 0%{?rhel} <= 7 %if 0%{?rhel} && 0%{?rhel} <= 7
%global meson_python_flags -Dwith_py2=true # There is no python3-gobject-base in RHEL 7. But it exists in EPEL 7.
%global meson_python_flags -Dwith_py2=true -Dwith_py3=true
%global build_python2 1 %global build_python2 1
%global build_python3 1
%else %else
%global meson_python_flags -Dwith_py2=false %global meson_python_flags -Dwith_py2=false -Dwith_py3=true
%global build_python2 0 %global build_python2 0
%global build_python3 1
%endif %endif
%global upstream_name libmodulemd %global upstream_name libmodulemd
@ -13,8 +16,8 @@
%endif %endif
Name: %{upstream_name}%{?v2_suffix} Name: %{upstream_name}%{?v2_suffix}
Version: 2.12.1 Version: 2.13.0
Release: 2%{?dist} Release: 1%{?dist}
Summary: Module metadata manipulation library Summary: Module metadata manipulation library
# COPYING: MIT # COPYING: MIT
@ -44,8 +47,10 @@ BuildRequires: file-devel
BuildRequires: python2-devel BuildRequires: python2-devel
BuildRequires: python-gobject-base BuildRequires: python-gobject-base
%endif %endif
%if %{build_python3}
BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-devel
BuildRequires: python%{python3_pkgversion}-gobject-base BuildRequires: python%{python3_pkgversion}-gobject-base
%endif
BuildRequires: help2man BuildRequires: help2man
@ -53,37 +58,38 @@ BuildRequires: help2man
%description %description
C Library for manipulating module metadata files. 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/master/README.md for
more details. more details.
%if %{build_python2} %if %{build_python2}
%package -n python2-%{name} %package -n python2-%{name}
Summary: Python 2 bindings for %{name} Summary: Python 2 bindings for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: python-gobject-base Requires: python-gobject-base
Requires: python-six Requires: python-six
%description -n python2-%{name} %description -n python2-%{name}
Python 2 bindings for %{name} Python 2 bindings for %{name}.
%endif %endif
%if %{build_python3}
%package -n python%{python3_pkgversion}-%{name} %package -n python%{python3_pkgversion}-%{name}
Summary: Python 3 bindings for %{name} Summary: Python 3 bindings for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: python%{python3_pkgversion}-gobject-base Requires: python%{python3_pkgversion}-gobject-base
%if (0%{?rhel} && 0%{?rhel} <= 7) %if (0%{?rhel} && 0%{?rhel} <= 7)
# The py3_dist macro on EPEL 7 doesn't work right at the moment # The py3_dist macro on EPEL 7 doesn't work right at the moment
Requires: python3.6dist(six) Requires: python3.6dist(six)
%else %else
Requires: %{py3_dist six} Requires: %{py3_dist six}
%endif %endif
%description -n python%{python3_pkgversion}-%{name} %description -n python%{python3_pkgversion}-%{name}
Python %{python3_pkgversion} bindings for %{name} Python %{python3_pkgversion} bindings for %{name}.
%endif
%package devel %package devel
@ -96,7 +102,7 @@ Conflicts: libmodulemd-devel
%description devel %description devel
Development files for libmodulemd. Development files for %{name}.
%prep %prep
@ -105,22 +111,21 @@ Development files for libmodulemd.
%build %build
%meson -Ddeveloper_build=false \ %meson \
%{meson_python_flags} -Dlibmagic=enabled \
-Drpmio=enabled \
-Dskip_introspection=false \
-Dtest_installed_lib=false \
-Dwith_docs=true \
-Dwith_manpages=enabled \
%{meson_python_flags}
%meson_build %meson_build
%check %check
export LC_CTYPE=C.utf8 export LC_CTYPE=C.utf8
# Don't run tests on ARM for now. There are problems with
# performance on the builders and often these time out.
%ifnarch %{arm} aarch64
# The tests sometimes time out in CI, so give them a little extra time # The tests sometimes time out in CI, so give them a little extra time
%{__meson} test -C %{_vpath_builddir} %{?_smp_mesonflags} --print-errorlogs -t 5 %{__meson} test -C %{_vpath_builddir} %{?_smp_mesonflags} --print-errorlogs -t 5
%endif
%install %install
@ -142,7 +147,7 @@ mv %{buildroot}%{_mandir}/man1/modulemd-validator.1 \
%files %files
%license COPYING %license COPYING
%doc README.md %doc NEWS README.md
%{_bindir}/modulemd-validator%{?v2_suffix} %{_bindir}/modulemd-validator%{?v2_suffix}
%{_mandir}/man1/modulemd-validator%{?v2_suffix}.1* %{_mandir}/man1/modulemd-validator%{?v2_suffix}.1*
%{_libdir}/%{upstream_name}.so.2* %{_libdir}/%{upstream_name}.so.2*
@ -167,11 +172,16 @@ mv %{buildroot}%{_mandir}/man1/modulemd-validator.1 \
%endif %endif
%if %{build_python3}
%files -n python%{python3_pkgversion}-%{name} %files -n python%{python3_pkgversion}-%{name}
%{python3_sitearch}/gi/overrides/ %{python3_sitearch}/gi/overrides/
%endif
%changelog %changelog
* Fri Jul 09 2021 Petr Pisar <ppisar@redhat.com> - 2.13.0-1
- 2.13.0 bump
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 2.12.1-2 * Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 2.12.1-2
- Rebuilt for Python 3.10 - Rebuilt for Python 3.10

View File

@ -1,2 +1,2 @@
SHA512 (modulemd-2.12.1.tar.xz) = 2bd4242f0f1aea561a5b899678237f7390652987e02c46652b72eadebde60d7cfb82d93e0a720e3c070261a7449245b9319b9fd755aba1c6f354660a959373b3 SHA512 (modulemd-2.13.0.tar.xz) = b2a4fa4120d4dca714ef724a9e8f805d4f8a306a950e670f86f6184467c070ddb93360fff3bb079eb3a442b52024fe796ceb1195800d62bbb1f5cb67f8889e05
SHA512 (modulemd-2.12.1.tar.xz.asc) = 072141c83a991ac7f1177d2e3ccf2b050c2d644453c5e815ad826b8fe4a994954d0754c9da5279727ccc74f182c193f89d5f227ff0580b0a8ab3e730ab52b287 SHA512 (modulemd-2.13.0.tar.xz.asc) = f588c1333b91db297ab5ec7e67f1d62884d4f58032a75feed1b3c3ff2ae67eb0f13a4209605f4a32d00fe6ccb3561b6fab81c2196f1d4439222b0e141f541ff6