diff --git a/libmodulemd.spec b/libmodulemd.spec index 88b4a3a..51a540a 100644 --- a/libmodulemd.spec +++ b/libmodulemd.spec @@ -18,88 +18,59 @@ BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(yaml-0.1) BuildRequires: pkgconfig(gtk-doc) -BuildRequires: python3-devel -BuildRequires: python3-gobject-base +BuildRequires: python36-devel +BuildRequires: python36-gobject-base %ifarch %{valgrind_arches} BuildRequires: valgrind %endif -Obsoletes: python2-modulemd < 1.3.4 -Obsoletes: python3-modulemd < 1.3.4 # Patches + %description C Library for manipulating module metadata files. See https://github.com/fedora-modularity/libmodulemd/blob/master/README.md for more details. -%package -n python3-%{name} -Summary: Python 3 bindings for %{name} +%package -n python2-%{name} +Summary: Python 2 bindings for %{name} BuildArch: noarch Requires: libmodulemd = %{version}-%{release} -Requires: python3-gobject-base +Requires: python-gobject-base +Obsoletes: python2-modulemd < 1.3.4 + +%description -n python2-%{name} +Python 2 bindings for %{name} + + +%package -n python36-%{name} +Summary: Python 3.6 bindings for %{name} +BuildArch: noarch +Requires: libmodulemd = %{version}-%{release} +Requires: python36-gobject-base Obsoletes: python3-modulemd < 1.3.4 -%description -n python3-%{name} -Python 3 bindings for %{name} +%description -n python36-%{name} +Python 3.6 bindings for %{name} %package devel Summary: Development files for libmodulemd Requires: %{name}%{?_isa} = %{version}-%{release} - +Conflicts: libmodulemd1-devel %description devel Development files for libmodulemd. -%package -n libmodulemd1 -Summary: Compatibility package for libmodulemd 1.x -Version: %{libmodulemd_v1_version} -Obsoletes: libmodulemd < 2 -Provides: libmodulemd = %{libmodulemd_v1_version}-%{release} -Provides: libmodulemd%{?_isa} = %{libmodulemd_v1_version}-%{release} - -%description -n libmodulemd1 -Compatibility library for libmodulemd 1.x - - -%package -n libmodulemd1-devel -Summary: Compatibility development package for libmodulemd 1.x -Version: %{libmodulemd_v1_version} -Requires: libmodulemd1%{?_isa} = %{libmodulemd_v1_version}-%{release} -Conflicts: %{name}-devel -Obsoletes: libmodulemd-devel < 2 -Provides: libmodulemd-devel = %{libmodulemd_v1_version}-%{release} -RemovePathPostfixes: .compat - - -%description -n libmodulemd1-devel -Development files for libmodulemd 1.x - - -%package -n python3-libmodulemd1 -Summary: Python 3 bindings for %{name}1 -Version: %{libmodulemd_v1_version} -BuildArch: noarch -Requires: libmodulemd1 = %{libmodulemd_v1_version}-%{release} -Requires: python3-gobject-base - -Obsoletes: python3-libmodulemd < 2 -Provides: python3-libmodulemd = %{libmodulemd_v1_version}-%{release} - -%description -n python3-libmodulemd1 -Python 3 bindings for libmodulemd1 - - %prep %autosetup -p1 -n modulemd-%{libmodulemd_version} %build -%meson -Ddeveloper_build=false -Dbuild_api_v1=true -Dbuild_api_v2=true +%meson -Ddeveloper_build=false -Dbuild_api_v1=false -Dbuild_api_v2=true %meson_build @@ -126,9 +97,6 @@ export MMD_SKIP_VALGRIND=1 %install %meson_install -ln -s libmodulemd.so.%{libmodulemd_v1_version} \ - %{buildroot}%{_libdir}/%{name}.so.compat - %files %license COPYING @@ -151,32 +119,16 @@ ln -s libmodulemd.so.%{libmodulemd_v1_version} \ %{_datadir}/gtk-doc/html/modulemd-2.0/ -%files -n python3-%{name} +%files -n python2-%{name} -%files -n python3-libmodulemd1 +%files -n python36-%{name} -%files -n libmodulemd1 -%license COPYING -%doc README.md -%{_bindir}/modulemd-validator-v1 -%{_libdir}/%{name}.so.1* -%dir %{_libdir}/girepository-1.0 -%{_libdir}/girepository-1.0/Modulemd-1.0.typelib - - -%files -n libmodulemd1-devel -%{_libdir}/%{name}.so.compat -%{_libdir}/pkgconfig/modulemd.pc -%{_includedir}/modulemd/ -%dir %{_datadir}/gir-1.0 -%{_datadir}/gir-1.0/Modulemd-1.0.gir -%dir %{_datadir}/gtk-doc -%dir %{_datadir}/gtk-doc/html -%{_datadir}/gtk-doc/html/modulemd-1.0/ - %changelog +* Wed Mar 27 2019 Stephen Gallagher - 2.2.1-1 +- Release libmodulemd 2.x for COPR on EPEL 7 + * Tue Mar 26 2019 Stephen Gallagher - 2.2.1-1 - Update to libmodulemd 2.2.1 - Fixes builds on i686