diff --git a/libmodulemd.spec b/libmodulemd.spec index c5c1b5f..5bc04a8 100644 --- a/libmodulemd.spec +++ b/libmodulemd.spec @@ -1,6 +1,8 @@ %global libmodulemd_version 2.1.0 %global libmodulemd_v1_version 1.8.2 +%bcond_with libmodulemd2 + Name: libmodulemd Version: %{libmodulemd_version} Release: 3%{?dist} @@ -35,6 +37,7 @@ See https://github.com/fedora-modularity/libmodulemd/blob/master/README.md for more details. +%if %{with libmodulemd2} %package -n python3-%{name} Summary: Python 3 bindings for %{name} BuildArch: noarch @@ -54,6 +57,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description devel Development files for libmodulemd. +%endif # with libmodulemd2 %package -n libmodulemd1 Summary: Compatibility package for libmodulemd 1.x @@ -99,7 +103,7 @@ Python 3 bindings for libmodulemd1 %build -%meson -Ddeveloper_build=false -Dbuild_api_v1=true -Dbuild_api_v2=true +%meson -Ddeveloper_build=false -Dbuild_api_v1=true -Dbuild_api_v2=false %meson_build @@ -125,7 +129,13 @@ export MMD_SKIP_VALGRIND=1 ln -s libmodulemd.so.%{libmodulemd_v1_version} \ %{buildroot}%{_libdir}/%{name}.so.compat +%if !%{with libmodulemd2} +rm -f %{buildroot}%{_libdir}/%{name}.so +ln -s %{_bindir}/modulemd-validator-v1 \ + %{buildroot}%{_bindir}/modulemd-validator +%endif +%if %{with libmodulemd2} %files %license COPYING %doc README.md @@ -148,7 +158,7 @@ ln -s libmodulemd.so.%{libmodulemd_v1_version} \ %files -n python3-%{name} - +%endif # with libmodulemd2 %files -n python3-libmodulemd1 @@ -157,9 +167,13 @@ ln -s libmodulemd.so.%{libmodulemd_v1_version} \ %license COPYING %doc README.md %{_bindir}/modulemd-validator-v1 +%if !%{with libmodulemd2} +%{_bindir}/modulemd-validator +%endif %{_libdir}/%{name}.so.1* %dir %{_libdir}/girepository-1.0 %{_libdir}/girepository-1.0/Modulemd-1.0.typelib +%{python3_sitearch}/gi/overrides/ %files -n libmodulemd1-devel @@ -180,6 +194,9 @@ ln -s libmodulemd.so.%{libmodulemd_v1_version} \ * Fri Feb 01 2019 Fedora Release Engineering - 2.1.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild +* Wed Jan 30 2019 Stephen Gallagher - 2.1.0-1.1 +- Don't build the 2.0 API for F28 + * Sat Jan 26 2019 Stephen Gallagher - 2.1.0-1 - Update to libmodulemd 2.1.0 and 1.8.2 - Drop upstreamed patches