Update to 2.0.0beta2

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>

.gitignore

@@ -24,3 +24,4 @@
 /modulemd-1.6.3.tar.xz
 /modulemd-1.6.4.tar.xz
 /modulemd-1.7.0.tar.xz
+/modulemd-2.0.0beta2.tar.xz

libmodulemd.spec

@@ -1,24 +1,31 @@
+%global libmodulemd_version 2.0.0
+%global libmodulemd_v1_version 1.8.0
+
 Name:           libmodulemd
-Version:        1.7.0
+Version:        %{libmodulemd_version}
-Release:        1%{?dist}
+Release:        0.beta2%{?dist}
 Summary:        Module metadata manipulation library
 
 License:        MIT
 URL:            https://github.com/fedora-modularity/libmodulemd
-Source0:        %{url}/releases/download/%{name}-%{version}/modulemd-%{version}.tar.xz
+Source0:        %{url}/releases/download/%{name}-%{version}/modulemd-%{version}beta2.tar.xz
 
-BuildRequires:  meson
+BuildRequires:  meson >= 0.45.1-3
 BuildRequires:  pkgconfig
 BuildRequires:  gcc
+BuildRequires:  gcc-c++
 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
+%ifarch %{valgrind_arches}
 BuildRequires:  valgrind
+%endif
 
 Obsoletes:      python2-modulemd < 1.3.4
-
+Obsoletes:      python3-modulemd < 1.3.4
 
 # Patches
 
@@ -39,8 +46,6 @@ Obsoletes: python3-modulemd < 1.3.4
 %description -n python3-%{name}
 Python 3 bindings for %{name}
 
-Also provides utility module ModulemdUtils.
-
 
 %package devel
 Summary:        Development files for libmodulemd
@@ -51,12 +56,48 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 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
+
+%description -n python3-libmodulemd1
+Python 3 bindings for libmodulemd1
+
+
 %prep
-%autosetup -p1 -n modulemd-%{version}
+%autosetup -p1 -n modulemd-%{libmodulemd_version}
 
 
 %build
-%meson -Ddeveloper_build=false
+%meson -Ddeveloper_build=false -Dbuild_api_v1=true -Dbuild_api_v2=true
 %meson_build
 
 
@@ -69,6 +110,9 @@ export LC_CTYPE=C.utf8
 # https://bugs.kde.org/show_bug.cgi?id=386945
 export MMD_SKIP_VALGRIND=1
 %endif
+%ifnarch %{valgrind_arches}
+export MMD_SKIP_VALGRIND=1
+%endif
 
 %meson_test
 
@@ -76,24 +120,47 @@ export MMD_SKIP_VALGRIND=1
 %install
 %meson_install
 
-
+ln -s libmodulemd.so.%{libmodulemd_v1_version} \
-%ldconfig_scriptlets
+      %{buildroot}%{_libdir}/%{name}.so.compat
 
 
 %files
 %license COPYING
 %doc README.md
+%{_libdir}/%{name}.so.2*
+%dir %{_libdir}/girepository-1.0
+%{_libdir}/girepository-1.0/Modulemd-2.0.typelib
+%{python3_sitearch}/gi/overrides/
+
+
+%files devel
+%{_libdir}/%{name}.so
+%{_libdir}/pkgconfig/modulemd-2.0.pc
+%{_includedir}/modulemd-2.0/
+%dir %{_datadir}/gir-1.0
+%{_datadir}/gir-1.0/Modulemd-2.0.gir
+%dir %{_datadir}/gtk-doc
+%dir %{_datadir}/gtk-doc/html
+%{_datadir}/gtk-doc/html/modulemd-2.0/
+
+
+%files -n python3-%{name}
+
+
+%files -n python3-libmodulemd1
+
+
+%files -n libmodulemd1
+%license COPYING
+%doc README.md
 %{_bindir}/modulemd-validator
 %{_libdir}/%{name}.so.1*
 %dir %{_libdir}/girepository-1.0
 %{_libdir}/girepository-1.0/Modulemd-1.0.typelib
 
 
-%files -n python3-%{name}
+%files -n libmodulemd1-devel
-
+%{_libdir}/%{name}.so.compat
-
-%files devel
-%{_libdir}/%{name}.so
 %{_libdir}/pkgconfig/modulemd.pc
 %{_includedir}/modulemd/
 %dir %{_datadir}/gir-1.0
@@ -103,6 +170,20 @@ export MMD_SKIP_VALGRIND=1
 %{_datadir}/gtk-doc/html/modulemd-1.0/
 
 %changelog
+* Tue Dec 11 2018 Stephen Gallagher <sgallagh@redhat.com> - 2.0.0-0.beta2
+- Update to 2.0.0beta2
+- Better validation of stored content during read and write operations
+- ModuleIndex now returns FALSE if any subdocument fails
+- Fix tests on 32-bit platforms
+- Make unknown keys in YAML maps non-fatal for libmodulemd1
+- Make unknown keys in YAML maps optionally fatal for libmodulemd 2.x
+- Fix RPM version requirements for libmodulemd1
+
+* Mon Dec 10 2018 Stephen Gallagher <sgallagh@redhat.com> - 2.0.0-0.beta1
+- Update to 2.0.0beta1
+- Total rewrite to 2.0 API
+- https://sgallagh.fedorapeople.org/docs/libmodulemd/2.0/
+
 * Fri Oct 26 2018 Stephen Gallagher <sgallagh@redhat.com> - 1.7.0-1
 - Update to 1.7.0
 - Enhance YAML parser for use with `fedmod lint`

sources

@@ -1 +1 @@
-SHA512 (modulemd-1.7.0.tar.xz) = 6bdf5c77a25ae0d1bf583e5b5fd1ab6ac609c3c3893f66529cb09fcec08479afc3765048abf03bb6afee531119fa6f2bc9ebb51ac388751ea4f59ce64434104e
+SHA512 (modulemd-2.0.0beta2.tar.xz) = de136912ab2c5a238783265b193c18b6addaaa7f31b402bc19ace16d3551b874e787d1b12cda7563a5a1905875dc57186ee09355c26e4ba35a73af0640e72266