Drop removed meson -D developer_build option from CI tests

.gitignore

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

libmodulemd.spec

@@ -1,9 +1,19 @@
 %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_python3 1
 %else
-  %global meson_python_flags -Dwith_py2=false
+  %global meson_python_flags -Dwith_py2=false -Dwith_py3=true
   %global build_python2 0
+  %global build_python3 1
+%endif
+
+%if (0%{?fedora} && 0%{?fedora} <= 50) || (0%{?rhel} && 0%{?rhel} <= 10)
+  # Support RHEL 8 module builds with an invalid buildorder.
+  %global meson_accept_overflowed_buildorder_flag -Daccept_overflowed_buildorder=true
+%else
+  %global meson_accept_overflowed_buildorder_flag -Daccept_overflowed_buildorder=false
 %endif
 
 %global upstream_name libmodulemd
@@ -13,8 +23,8 @@
 %endif
 
 Name:           %{upstream_name}%{?v2_suffix}
-Version:        2.12.1
-Release:        1%{?dist}
+Version:        2.14.0
+Release:        2%{?dist}
 Summary:        Module metadata manipulation library
 
 # COPYING:      MIT
@@ -44,46 +54,45 @@ BuildRequires:  file-devel
 BuildRequires:  python2-devel
 BuildRequires:  python-gobject-base
 %endif
+%if %{build_python3}
 BuildRequires:  python%{python3_pkgversion}-devel
 BuildRequires:  python%{python3_pkgversion}-gobject-base
-BuildRequires:  help2man
-
-
-# Patches
+%endif
 
 
 %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
 more details.
 
 
 %if %{build_python2}
 %package -n python2-%{name}
-Summary: Python 2 bindings for %{name}
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: python-gobject-base
-Requires: python-six
+Summary:        Python 2 bindings for %{name}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       python-gobject-base
+Requires:       python-six
 
 %description -n python2-%{name}
-Python 2 bindings for %{name}
+Python 2 bindings for %{name}.
 %endif
 
 
+%if %{build_python3}
 %package -n python%{python3_pkgversion}-%{name}
-Summary: Python 3 bindings for %{name}
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: python%{python3_pkgversion}-gobject-base
-
+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)
+Requires:       python3.6dist(six)
 %else
-Requires: %{py3_dist six}
+Requires:       %{py3_dist six}
 %endif
 
 %description -n python%{python3_pkgversion}-%{name}
-Python %{python3_pkgversion} bindings for %{name}
+Python %{python3_pkgversion} bindings for %{name}.
+%endif
 
 
 %package devel
@@ -96,7 +105,7 @@ Conflicts:      libmodulemd-devel
 
 
 %description devel
-Development files for libmodulemd.
+Development files for %{name}.
 
 
 %prep
@@ -105,22 +114,22 @@ Development files for libmodulemd.
 
 
 %build
-%meson -Ddeveloper_build=false \
-       %{meson_python_flags}
-
+%meson \
+    %{meson_accept_overflowed_buildorder_flag} \
+    -Dlibmagic=enabled \
+    -Drpmio=enabled \
+    -Dskip_introspection=false \
+    -Dtest_installed_lib=false \
+    -Dwith_docs=true \
+    -Dwith_manpages=enabled \
+    %{meson_python_flags}
 %meson_build
 
 
 %check
-
 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
 %{__meson} test -C %{_vpath_builddir} %{?_smp_mesonflags} --print-errorlogs -t 5
-%endif
 
 
 %install
@@ -142,7 +151,7 @@ mv %{buildroot}%{_mandir}/man1/modulemd-validator.1 \
 
 %files
 %license COPYING
-%doc README.md
+%doc NEWS README.md
 %{_bindir}/modulemd-validator%{?v2_suffix}
 %{_mandir}/man1/modulemd-validator%{?v2_suffix}.1*
 %{_libdir}/%{upstream_name}.so.2*
@@ -167,11 +176,27 @@ mv %{buildroot}%{_mandir}/man1/modulemd-validator.1 \
 %endif
 
 
+%if %{build_python3}
 %files -n python%{python3_pkgversion}-%{name}
 %{python3_sitearch}/gi/overrides/
+%endif
 
 
 %changelog
+* Tue Feb 08 2022 Petr Pisar <ppisar@redhat.com> - 2.14.0-2
+- Drop removed meson -D developer_build option from CI tests
+
+* Fri Feb 04 2022 Petr Pisar <ppisar@redhat.com> - 2.14.0-1
+- 2.14.0 bump
+
+
+* Tue Sep 14 2021 Petr Pisar <ppisar@redhat.com> - 2.13.0-2
+- Accept an invalid buildorder 18446744073709551615 found in RHEL 8 repositories
+  (https://pagure.io/koji/issue/3025)
+
+* Fri Jul 09 2021 Petr Pisar <ppisar@redhat.com> - 2.13.0-1
+- 2.13.0 bump
+
 * Mon May 03 2021 Petr Pisar <ppisar@redhat.com> - 2.12.1-1
 - 2.12.1 bump
 

sources

@@ -1,2 +1,2 @@
-SHA512 (modulemd-2.12.1.tar.xz) = 2bd4242f0f1aea561a5b899678237f7390652987e02c46652b72eadebde60d7cfb82d93e0a720e3c070261a7449245b9319b9fd755aba1c6f354660a959373b3
-SHA512 (modulemd-2.12.1.tar.xz.asc) = 072141c83a991ac7f1177d2e3ccf2b050c2d644453c5e815ad826b8fe4a994954d0754c9da5279727ccc74f182c193f89d5f227ff0580b0a8ab3e730ab52b287
+SHA512 (modulemd-2.14.0.tar.xz) = 90439cba83f4a8711095f1b9b92ba9135bade202703d698d192d066955ae8df3f53226fcd5fc73cd2873e5599822272f00a5b536cf62e3e51c37bbca32b7f756
+SHA512 (modulemd-2.14.0.tar.xz.asc) = a742c177084b2f1445704583ea43c09b479502432b62c1880ca4917dfa7550b6dfc3aef2498a5afdba61323451878b6ede7fdfba37d433982f0cc3925811668f

tests/tests.yml

@@ -26,7 +26,7 @@
     tests:
     - build:
         dir: .
-        run: meson -Dtest_installed_lib=true -Ddeveloper_build=false source
+        run: meson -Daccept_overflowed_buildorder=true -Dlibmagic=enabled -Drpmio=enabled -Dskip_introspection=false -Dtest_installed_lib=true -Dwith_py2=false -Dwith_py3=true -Ddeveloper_build=false source
     - unittests:
         dir: .
         run: ninja test