Hello community,
here is the log from the commit of package libmodulemd for openSUSE:Factory
checked in at 2019-04-01 12:39:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libmodulemd (Old)
and /work/SRC/openSUSE:Factory/.libmodulemd.new.25356 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libmodulemd"
Mon Apr 1 12:39:45 2019 rev:2 rq:690190 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/libmodulemd/libmodulemd.changes 2019-02-20
14:09:57.270966955 +0100
+++ /work/SRC/openSUSE:Factory/.libmodulemd.new.25356/libmodulemd.changes
2019-04-01 12:39:48.225956522 +0200
@@ -1,0 +2,16 @@
+Sun Mar 31 14:23:59 UTC 2019 - Neal Gompa <ngomp...@gmail.com>
+
+- Update to 2.2.2 (v2) and 1.8.5 (v1)
+ + Fix documentation for ModuleStream.depends_on_stream()
+ + Update APIs to handling full NSVCA of modules
+ + Add new APIs for handling full NSVCA of modules
+ + Add 'buildonly' option for components
+ + Add 'buildafter' component
+ + Add config option for python overrides
+- Drop patches included in upstream release
+ * 0001-V2-Add-missing-include-for-string.h-to-modulemd-util.patch
+ * 0002-Tests-Use-bin-bash-for-interpreter-shebangs-for-shel.patch
+- Add patch backported from upstream to avoid Python 2 dependency
+ * 0001-Only-require-python2-if-installing-overrides.patch
+
+-------------------------------------------------------------------
Old:
----
0001-V2-Add-missing-include-for-string.h-to-modulemd-util.patch
0002-Tests-Use-bin-bash-for-interpreter-shebangs-for-shel.patch
modulemd-2.1.0.tar.xz
New:
----
0001-Only-require-python2-if-installing-overrides.patch
modulemd-2.2.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libmodulemd.spec ++++++
--- /var/tmp/diff_new_pack.8sgEjZ/_old 2019-04-01 12:39:48.841956821 +0200
+++ /var/tmp/diff_new_pack.8sgEjZ/_new 2019-04-01 12:39:48.841956821 +0200
@@ -17,8 +17,8 @@
%global majorversion 2
-%global minorversion 1
-%global patchversion 0
+%global minorversion 2
+%global patchversion 2
%global majorminorversion %{majorversion}.%{minorversion}
%global nsversion %{majorversion}.0
@@ -31,7 +31,7 @@
# Legacy modulemd API
%global oldmajorver 1
%global oldminorver 8
-%global oldpatchver 2
+%global oldpatchver 5
%global oldmajorminorver %{oldmajorver}.%{oldminorver}
%global oldnsver %{oldmajorver}.0
@@ -51,11 +51,10 @@
URL: https://github.com/fedora-modularity/libmodulemd
Source0:
%{url}/releases/download/%{name}-%{libmodulemd_version}/modulemd-%{libmodulemd_version}.tar.xz
-# Patches backported from upstream
-Patch0001: 0001-V2-Add-missing-include-for-string.h-to-modulemd-util.patch
-Patch0002: 0002-Tests-Use-bin-bash-for-interpreter-shebangs-for-shel.patch
+# Backports from upstream
+Patch0001: 0001-Only-require-python2-if-installing-overrides.patch
-BuildRequires: meson >= 0.44.0
+BuildRequires: meson >= 0.46.0
BuildRequires: gcc
BuildRequires: pkgconfig(gobject-2.0)
BuildRequires: pkgconfig(gobject-introspection-1.0)
@@ -148,8 +147,15 @@
%prep
%autosetup -p1 -n modulemd-%{libmodulemd_version}
+%if 0%{?suse_version} == 1500 && 0%{?sle_version} >= 150100
+# SLE 15 SP1 / openSUSE Leap 15.1 higher have a patched meson that works
+sed -e "s/meson_version : '>=0.47.0'/meson_version : '>=0.46.0'/" -i
meson.build
+%endif
+
%build
-%meson -Ddeveloper_build=false -Dbuild_api_v1=true -Dbuild_api_v2=true
+%meson -Ddeveloper_build=false -Dbuild_api_v1=true -Dbuild_api_v2=true \
+ -Dwith_py3_overrides=true -Dwith_py2_overrides=false
+
%meson_build
%check
++++++ 0001-Only-require-python2-if-installing-overrides.patch ++++++
>From cdfa53d1f761edafe88e2e12aa953ba6c15a92ee Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgall...@redhat.com>
Date: Thu, 28 Mar 2019 10:24:04 -0400
Subject: [PATCH] Only require python2 if installing overrides
Signed-off-by: Stephen Gallagher <sgall...@redhat.com>
---
libmodulemd.spec.in | 25 ++++++++++++++++++++++---
meson.build | 7 ++++++-
meson_options.txt | 2 +-
3 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/libmodulemd.spec.in b/libmodulemd.spec.in
index fc7753b..a33fdca 100644
--- a/libmodulemd.spec.in
+++ b/libmodulemd.spec.in
@@ -1,6 +1,14 @@
%global libmodulemd_version @VERSION@
%global libmodulemd_v1_version @V1_VERSION@
+%if ! 0%{?fedora} > 30
+%global build_python2 1
+%global meson_python_flags -Dwith_py2_overrides=true
+%else
+%global build_python2 0
+%global meson_python_flags -Dwith_py2_overrides=false
+%endif
+
Name: libmodulemd
Version: %{libmodulemd_version}
Release: 0%{?dist}.@DATETIME@
@@ -18,8 +26,10 @@ BuildRequires: pkgconfig(gobject-2.0)
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(yaml-0.1)
BuildRequires: pkgconfig(gtk-doc)
+%if %{build_python2}
BuildRequires: python2-devel
BuildRequires: python-gobject-base
+%endif
BuildRequires: python3-devel
BuildRequires: python3-gobject-base
BuildRequires: valgrind
@@ -36,6 +46,7 @@ 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}
@@ -44,6 +55,7 @@ Obsoletes: python2-modulemd < 1.3.4
%description -n python2-%{name}
Python 3 bindings for %{name}
+%endif
%package -n python3-%{name}
@@ -85,11 +97,11 @@ Obsoletes: libmodulemd-devel < 2
Provides: libmodulemd-devel = %{libmodulemd_v1_version}-%{release}
RemovePathPostfixes: .compat
-
%description -n libmodulemd1-devel
Development files for libmodulemd 1.x
+%if %{build_python2}
%package -n python2-libmodulemd1
Summary: Python 2 bindings for %{name}1
Version: %{libmodulemd_v1_version}
@@ -98,6 +110,7 @@ Requires: python-gobject-base
%description -n python2-libmodulemd1
Python 2 bindings for libmodulemd1
+%endif
%package -n python3-libmodulemd1
@@ -115,7 +128,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=true
%{meson_python_flags}
%if 0%{?rhel} <= 7
# ALERT!!! PURE HACK FOR EPEL!
@@ -165,9 +178,10 @@ ln -s libmodulemd.so.%{libmodulemd_v1_version} \
%{_datadir}/gtk-doc/html/modulemd-2.0/
+%if %{build_python2}
%files -n python2-%{name}
%{python2_sitearch}/gi/overrides/
-
+%endif
%files -n python3-%{name}
%{python3_sitearch}/gi/overrides/
@@ -176,6 +190,11 @@ ln -s libmodulemd.so.%{libmodulemd_v1_version} \
%files -n python3-libmodulemd1
+%if %{build_python2}
+%files -n python2-libmodulemd1
+%endif
+
+
%files -n libmodulemd1
%license COPYING
%doc README.md
diff --git a/meson.build b/meson.build
index 1ea6cfb..2640cca 100644
--- a/meson.build
+++ b/meson.build
@@ -67,7 +67,12 @@ else
python3 = pymod.find_installation()
endif
-python2 = pymod.find_installation('python2')
+with_py2_overrides = get_option('with_py2_overrides')
+if with_py2_overrides
+ python2 = pymod.find_installation('python2')
+else
+ python2 = disabler()
+endif
spec_tmpl = find_program('spec_tmpl.sh')
diff --git a/meson_options.txt b/meson_options.txt
index d2bafc7..147419f 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -16,5 +16,5 @@ option('test_dirty_git', type : 'boolean', value : false)
option('test_installed_lib', type : 'boolean', value : false)
option('skip_introspection', type : 'boolean', value : false)
option('python_name', type : 'string')
-option('with_py2_overrides', type : 'boolean', value : true)
+option('with_py2_overrides', type : 'boolean', value : false)
option('with_py3_overrides', type : 'boolean', value : true)
--
2.20.1
++++++ modulemd-2.1.0.tar.xz -> modulemd-2.2.2.tar.xz ++++++
++++ 8908 lines of diff (skipped)
