The package rpms/libmodulemd.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/libmodulemd.git/commit/?id=5500b7...
https://src.fedoraproject.org/cgit/rpms/libmodulemd.git/commit/?id=88a95b....
Change:
+%ifnarch %{valgrind_arches}
+%ifarch %{power64} s390x
Thanks.
Full change:
============
commit dd26c4a31aeb6c654d747c74669c3846fdf99ed7
Author: Stephen Gallagher <sgallagh(a)redhat.com>
Date: Thu Dec 13 11:53:14 2018 -0500
Update to 2.0.0 final
- Assorted fixes for validation
- Add modulemd-validator tool based on v2 code
- Fix a crash when merging defaults
Signed-off-by: Stephen Gallagher <sgallagh(a)redhat.com>
diff --git a/.gitignore b/.gitignore
index 1dead76..9570acc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@
/modulemd-1.6.4.tar.xz
/modulemd-1.7.0.tar.xz
/modulemd-2.0.0beta2.tar.xz
+/modulemd-2.0.0.tar.xz
diff --git a/libmodulemd.spec b/libmodulemd.spec
index 6eaf9a4..93bdfe0 100644
--- a/libmodulemd.spec
+++ b/libmodulemd.spec
@@ -3,12 +3,12 @@
Name: libmodulemd
Version: %{libmodulemd_version}
-Release: 0.beta2%{?dist}
+Release: 1%{?dist}
Summary: Module metadata manipulation library
License: MIT
URL:
https://github.com/fedora-modularity/libmodulemd
-Source0:
%{url}/releases/download/%{name}-%{version}/modulemd-%{version}beta2.tar.xz
+Source0: %{url}/releases/download/%{name}-%{version}/modulemd-%{version}.tar.xz
BuildRequires: meson >= 0.45.1-3
BuildRequires: pkgconfig
@@ -127,6 +127,7 @@ ln -s libmodulemd.so.%{libmodulemd_v1_version} \
%files
%license COPYING
%doc README.md
+%{_bindir}/modulemd-validator
%{_libdir}/%{name}.so.2*
%dir %{_libdir}/girepository-1.0
%{_libdir}/girepository-1.0/Modulemd-2.0.typelib
@@ -153,7 +154,7 @@ ln -s libmodulemd.so.%{libmodulemd_v1_version} \
%files -n libmodulemd1
%license COPYING
%doc README.md
-%{_bindir}/modulemd-validator
+%{_bindir}/modulemd-validator-v1
%{_libdir}/%{name}.so.1*
%dir %{_libdir}/girepository-1.0
%{_libdir}/girepository-1.0/Modulemd-1.0.typelib
@@ -170,6 +171,12 @@ ln -s libmodulemd.so.%{libmodulemd_v1_version} \
%{_datadir}/gtk-doc/html/modulemd-1.0/
%changelog
+* Thu Dec 13 2018 Stephen Gallagher <sgallagh(a)redhat.com> - 2.0.0-1
+- Update to 2.0.0 final
+- Assorted fixes for validation
+- Add modulemd-validator tool based on v2 code
+- Fix a crash when merging defaults
+
* Tue Dec 11 2018 Stephen Gallagher <sgallagh(a)redhat.com> - 2.0.0-0.beta2
- Update to 2.0.0beta2
- Better validation of stored content during read and write operations
diff --git a/sources b/sources
index 8f29c30..ea8a861 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (modulemd-2.0.0beta2.tar.xz) =
de136912ab2c5a238783265b193c18b6addaaa7f31b402bc19ace16d3551b874e787d1b12cda7563a5a1905875dc57186ee09355c26e4ba35a73af0640e72266
+SHA512 (modulemd-2.0.0.tar.xz) =
6069d10fdf92e6e906693972bef55d1342e2eb1e092cb651b24d3ca7bb98c802b53dc5aa6a8206ca791697b6eb919f28a5ca36cb864433e3c34b914f9871c05e
commit 88a95b7d8e04a5c9c9cb86aa241f7a406aa44ddc
Author: Stephen Gallagher <sgallagh(a)redhat.com>
Date: Wed Dec 12 08:30:50 2018 -0500
Don't run valgrind on s390x
Signed-off-by: Stephen Gallagher <sgallagh(a)redhat.com>
diff --git a/libmodulemd.spec b/libmodulemd.spec
index df4db56..6eaf9a4 100644
--- a/libmodulemd.spec
+++ b/libmodulemd.spec
@@ -105,7 +105,7 @@ Python 3 bindings for libmodulemd1
export LC_CTYPE=C.utf8
-%ifarch %{power64}
+%ifarch %{power64} s390x
# Valgrind is broken on ppc64[le] with GCC7:
#
https://bugs.kde.org/show_bug.cgi?id=386945
export MMD_SKIP_VALGRIND=1
commit 5500b7840fa40b2fb6c21269f823dc40f37d4d66
Author: Stephen Gallagher <sgallagh(a)redhat.com>
Date: Tue Dec 11 22:01:29 2018 -0500
Update to 2.0.0beta2
Signed-off-by: Stephen Gallagher <sgallagh(a)redhat.com>
diff --git a/.gitignore b/.gitignore
index ef98f2d..1dead76 100644
--- a/.gitignore
+++ b/.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
diff --git a/libmodulemd.spec b/libmodulemd.spec
index 0c2d989..df4db56 100644
--- a/libmodulemd.spec
+++ b/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
-Release: 1%{?dist}
+Version: %{libmodulemd_version}
+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
-
-%ldconfig_scriptlets
+ln -s libmodulemd.so.%{libmodulemd_v1_version} \
+ %{buildroot}%{_libdir}/%{name}.so.compat
%files
%license COPYING
%doc README.md
-%{_bindir}/modulemd-validator
-%{_libdir}/%{name}.so.1*
+%{_libdir}/%{name}.so.2*
%dir %{_libdir}/girepository-1.0
-%{_libdir}/girepository-1.0/Modulemd-1.0.typelib
+%{_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 devel
-%{_libdir}/%{name}.so
+%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 libmodulemd1-devel
+%{_libdir}/%{name}.so.compat
%{_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(a)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(a)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(a)redhat.com> - 1.7.0-1
- Update to 1.7.0
- Enhance YAML parser for use with `fedmod lint`
diff --git a/sources b/sources
index 239b181..8f29c30 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (modulemd-1.7.0.tar.xz) =
6bdf5c77a25ae0d1bf583e5b5fd1ab6ac609c3c3893f66529cb09fcec08479afc3765048abf03bb6afee531119fa6f2bc9ebb51ac388751ea4f59ce64434104e
+SHA512 (modulemd-2.0.0beta2.tar.xz) =
de136912ab2c5a238783265b193c18b6addaaa7f31b402bc19ace16d3551b874e787d1b12cda7563a5a1905875dc57186ee09355c26e4ba35a73af0640e72266