commit libmodulemd for openSUSE:Factory
Hello community, here is the log from the commit of package libmodulemd for openSUSE:Factory checked in at 2020-07-15 11:22:42 Comparing /work/SRC/openSUSE:Factory/libmodulemd (Old) and /work/SRC/openSUSE:Factory/.libmodulemd.new.3060 (New) Package is "libmodulemd" Wed Jul 15 11:22:42 2020 rev:9 rq:819221 version:2.9.4 Changes: --- /work/SRC/openSUSE:Factory/libmodulemd/libmodulemd.changes 2020-01-21 20:58:10.528787707 +0100 +++ /work/SRC/openSUSE:Factory/.libmodulemd.new.3060/libmodulemd.changes 2020-07-15 11:24:10.221546121 +0200 @@ -1,0 +2,24 @@ +Tue Jul 7 10:43:34 UTC 2020 - Neal Gompa + +- Rebase to 2.9.4 + + Deprecate reset methods in favor of clear methods + + Add modulemd-validator man page + + Add Module.search_streams_by_glob() + + Add ModuleIndex.search_streams() method + + Add Modulemd.Module.search_streams_by_nsvca_glob() + + Add ModuleIndex.search_streams_by_nsvca_glob() + + Add ModuleIndex.search_rpms() + + Add ModuleStreamV2.search_profiles() + + Add framework for handling modulemd-packager YAML documents + + Return appropriate error when parsing a ModulemdStream doc fails + + Rework ModulemdError and ModulemdYamlError + + Improve Modulemd*ErrorEnum deprecations + + Use the new error enums everywhere + + Fix inconsistent error setting + + Make SKIP_UNKNOWN return UNKNOWN_ATTR in strict mode + + modulemd-packager: Check for extraneous attributes + + Fix bug printing negative buildorder values + + Handle NULL nsvca_patterns for globs + + Relax handling of differing content for the same NSVCA + +--- Old: modulemd-2.8.3.tar.xz New: modulemd-2.9.4.tar.xz Other differences: -- ++ libmodulemd.spec ++ --- /var/tmp/diff_new_pack.MMbBaw/_old 2020-07-15 11:24:12.133548013 +0200 +++ /var/tmp/diff_new_pack.MMbBaw/_new 2020-07-15 11:24:12.137548017 +0200 @@ -17,8 +17,8 @@ %global majorversion 2 -%global minorversion 8 -%global patchversion 3 +%global minorversion 9 +%global patchversion 4 %global majorminorversion %{majorversion}.%{minorversion} %global nsversion %{majorversion}.0 @@ -38,6 +38,7 @@ URL:https://github.com/fedora-modularity/libmodulemd Source0: %{url}/releases/download/%{name}-%{libmodulemd_version}/modulemd-%{libmodulemd_version}.tar.xz +BuildRequires: help2man BuildRequires: meson >= 0.47.0 BuildRequires: gcc BuildRequires: pkgconfig(gobject-2.0) @@ -126,6 +127,7 @@ %license COPYING %doc README.md %{_bindir}/modulemd-validator +%{_mandir}/man1/modulemd-validator.1* %files -n python3-%{name} %{python3_sitearch}/gi/overrides/Modulemd.py ++ modulemd-2.8.3.tar.xz -> modulemd-2.9.4.tar.xz ++ 13745 lines of diff (skipped)
commit libmodulemd for openSUSE:Factory
Hello community, here is the log from the commit of package libmodulemd for openSUSE:Factory checked in at 2020-01-21 20:58:02 Comparing /work/SRC/openSUSE:Factory/libmodulemd (Old) and /work/SRC/openSUSE:Factory/.libmodulemd.new.26092 (New) Package is "libmodulemd" Tue Jan 21 20:58:02 2020 rev:8 rq:765592 version:2.8.3 Changes: --- /work/SRC/openSUSE:Factory/libmodulemd/libmodulemd.changes 2019-12-07 15:23:14.607730015 +0100 +++ /work/SRC/openSUSE:Factory/.libmodulemd.new.26092/libmodulemd.changes 2020-01-21 20:58:10.528787707 +0100 @@ -1,0 +2,9 @@ +Sun Jan 19 14:55:59 UTC 2020 - Neal Gompa + +- Update to 2.8.3 + + Detect GDate autoptr when available to fix build with glib2 >= 2.63.3 + + Correct typo in MODULEMD_REPLACE_SET() + + Fix modulemd_buildopts_copy() to make a deep copy of the rpm whitelist + + Add support for new ModulemdBuildopts arches attribute + +--- Old: modulemd-2.8.2.tar.xz New: modulemd-2.8.3.tar.xz Other differences: -- ++ libmodulemd.spec ++ --- /var/tmp/diff_new_pack.AqxPeH/_old 2020-01-21 20:58:13.848789254 +0100 +++ /var/tmp/diff_new_pack.AqxPeH/_new 2020-01-21 20:58:13.852789256 +0100 @@ -1,7 +1,7 @@ # # spec file for package libmodulemd # -# Copyright (c) 2019 Neal Gompa . +# Copyright (c) 2020 Neal Gompa . # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %global majorversion 2 %global minorversion 8 -%global patchversion 2 +%global patchversion 3 %global majorminorversion %{majorversion}.%{minorversion} %global nsversion %{majorversion}.0 ++ modulemd-2.8.2.tar.xz -> modulemd-2.8.3.tar.xz ++ 2822 lines of diff (skipped)
commit libmodulemd for openSUSE:Factory
Hello community, here is the log from the commit of package libmodulemd for openSUSE:Factory checked in at 2019-12-07 15:21:06 Comparing /work/SRC/openSUSE:Factory/libmodulemd (Old) and /work/SRC/openSUSE:Factory/.libmodulemd.new.4691 (New) Package is "libmodulemd" Sat Dec 7 15:21:06 2019 rev:7 rq:752746 version:2.8.2 Changes: --- /work/SRC/openSUSE:Factory/libmodulemd/libmodulemd.changes 2019-05-24 11:33:25.061366054 +0200 +++ /work/SRC/openSUSE:Factory/.libmodulemd.new.4691/libmodulemd.changes 2019-12-07 15:23:14.607730015 +0100 @@ -1,0 +2,20 @@ +Sun Dec 1 15:04:32 UTC 2019 - Neal Gompa + +- Update to 2.8.2 + + modulemd v1 has been split out into is own tarball + + Add ModuleIndexMerger.resolve_ext() + + Fix transfer type for Module.search_streams() + + Correct typo in ModulemdModuleStream.arch property nickname + + Add gtk-doc descriptions for ModulemdModuleStream object properties + + Fix modulemd_yaml_parse_bool() comparisons so return value is correct + + Make ModulemdErrorEnum and ModulemdYamlErrorEnum into public enums + + Move modulemd_module_stream_v2_replace_*() method definitions +to correct header file and add documentation + + Refactor stream copy/upgrade helper macros + + Add Modulemd.Module.get_translation() + + Add ModuleIndex.update_from_defaults_directory() + + Modulemd.ModuleIndex.update_from_file() now supports reading files +compressed with gzip, bzip2 or xz +- libmodulemd1 has been split into its own package + +--- Old: modulemd-2.5.0.tar.xz New: modulemd-2.8.2.tar.xz Other differences: -- ++ libmodulemd.spec ++ --- /var/tmp/diff_new_pack.OfCoDx/_old 2019-12-07 15:23:15.283729921 +0100 +++ /var/tmp/diff_new_pack.OfCoDx/_new 2019-12-07 15:23:15.287729920 +0100 @@ -17,8 +17,8 @@ %global majorversion 2 -%global minorversion 5 -%global patchversion 0 +%global minorversion 8 +%global patchversion 2 %global majorminorversion %{majorversion}.%{minorversion} %global nsversion %{majorversion}.0 @@ -28,18 +28,6 @@ %global devname %{name}-devel %global girname typelib-1_0-Modulemd-%{majorversion}_0 -# Legacy modulemd API -%global oldmajorver 1 -%global oldminorver 8 -%global oldpatchver 11 -%global oldmajorminorver %{oldmajorver}.%{oldminorver} -%global oldnsver %{oldmajorver}.0 - -%global libmodulemd_v1_version %{oldmajorminorver}%{?oldpatchver:.%{oldpatchver}} - -%global oldlibname %{name}%{oldmajorver} -%global olddevname %{name}%{oldmajorver}-devel -%global oldgirname typelib-1_0-Modulemd-%{oldmajorver}_0 Name: libmodulemd Version:%{libmodulemd_version} @@ -50,13 +38,15 @@ URL:https://github.com/fedora-modularity/libmodulemd Source0: %{url}/releases/download/%{name}-%{libmodulemd_version}/modulemd-%{libmodulemd_version}.tar.xz -BuildRequires: meson >= 0.46.0 +BuildRequires: meson >= 0.47.0 BuildRequires: gcc BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(yaml-0.1) BuildRequires: pkgconfig(gtk-doc) BuildRequires: python3-gobject +BuildRequires: rpm-devel +BuildRequires: file-devel # For tests BuildRequires: gcc-c++ @@ -68,7 +58,6 @@ Summary:Tool for validating modulemd data Group: System/Packages Requires: %{libname}%{?_isa} = %{libmodulemd_version}-%{release} -Requires: %{oldlibname}%{?_isa} = %{libmodulemd_v1_version}-%{release} %description -n modulemd-validator The modulemd-validator tool provides the facility for verifying @@ -110,47 +99,11 @@ %description -n %{devname} This package provides files for developing applications to use %{name}. -%package -n %{oldlibname} -Summary:Main library for %{name} 1.x -Version:%{libmodulemd_v1_version} -Group: System/Libraries - -%description -n %{oldlibname} -This package provides the main library for applications -that use %{name} 1.x. - -%package -n %{oldgirname} -Summary:GObject Introspection interface description for %{name} 1.x -Version:%{libmodulemd_v1_version} -Group: System/Libraries -Requires: %{oldlibname}%{?_isa} = %{libmodulemd_v1_version}-%{release} - -%description -n %{oldgirname} -This package provides the GObject Introspection typelib interface -for applications to use %{name} 1.x. - -%package -n %{olddevname} -Summary:Development files for %{name} 1.x -Version:%{libmodulemd_v1_version} -Group: Development/Libraries/C and C++ -Conflicts: %{devname} -Requires: %{oldlibname}%{?_isa} = %{libmodulemd_v1_version}-%{release} -Requires: %{oldgirname}%{?_isa} = %{libmodulemd_v1_version}-
commit libmodulemd for openSUSE:Factory
Hello community, here is the log from the commit of package libmodulemd for openSUSE:Factory checked in at 2019-05-24 11:33:23 Comparing /work/SRC/openSUSE:Factory/libmodulemd (Old) and /work/SRC/openSUSE:Factory/.libmodulemd.new.5148 (New) Package is "libmodulemd" Fri May 24 11:33:23 2019 rev:6 rq:705109 version:unknown Changes: --- /work/SRC/openSUSE:Factory/libmodulemd/libmodulemd.changes 2019-05-12 11:44:51.951887694 +0200 +++ /work/SRC/openSUSE:Factory/.libmodulemd.new.5148/libmodulemd.changes 2019-05-24 11:33:25.061366054 +0200 @@ -1,0 +2,12 @@ +Fri May 24 03:25:00 UTC 2019 - Neal Gompa + +- Update to 2.5.0 (v2) and 1.8.11 (v1) + + Ensure that XMD is always emitted in the same order + + Add .clear_*() functions for all .add_*() functions + + Add ModuleStream.equals() + + Add ModuleIndex.get_default_streams() + + Add ModuleStreamV2.clear_dependencies() and .remove_dependencies() + + Fix bugs and memory issues with the XMD python bindings + + Assorted documentation enhancements + +--- Old: modulemd-2.3.1.tar.xz New: modulemd-2.5.0.tar.xz Other differences: -- ++ libmodulemd.spec ++ --- /var/tmp/diff_new_pack.uqCkTc/_old 2019-05-24 11:33:25.869365745 +0200 +++ /var/tmp/diff_new_pack.uqCkTc/_new 2019-05-24 11:33:25.869365745 +0200 @@ -17,8 +17,8 @@ %global majorversion 2 -%global minorversion 3 -%global patchversion 1 +%global minorversion 5 +%global patchversion 0 %global majorminorversion %{majorversion}.%{minorversion} %global nsversion %{majorversion}.0 @@ -31,7 +31,7 @@ # Legacy modulemd API %global oldmajorver 1 %global oldminorver 8 -%global oldpatchver 8 +%global oldpatchver 11 %global oldmajorminorver %{oldmajorver}.%{oldminorver} %global oldnsver %{oldmajorver}.0 ++ modulemd-2.3.1.tar.xz -> modulemd-2.5.0.tar.xz ++ 3298 lines of diff (skipped)
commit libmodulemd for openSUSE:Factory
Hello community, here is the log from the commit of package libmodulemd for openSUSE:Factory checked in at 2019-05-12 11:44:18 Comparing /work/SRC/openSUSE:Factory/libmodulemd (Old) and /work/SRC/openSUSE:Factory/.libmodulemd.new.5148 (New) Package is "libmodulemd" Sun May 12 11:44:18 2019 rev:5 rq:702039 version:unknown Changes: --- /work/SRC/openSUSE:Factory/libmodulemd/libmodulemd.changes 2019-04-30 13:05:20.353937894 +0200 +++ /work/SRC/openSUSE:Factory/.libmodulemd.new.5148/libmodulemd.changes 2019-05-12 11:44:51.951887694 +0200 @@ -1,0 +2,9 @@ +Fri May 10 14:30:36 UTC 2019 - Neal Gompa + +- Update to 2.3.1 (v2) and 1.8.8 (v1) + + Make Modulemd.Component.set_*() functions accept NULL (gh#fedora-modularity/libmodulemd#279) + + Fix segmentation fault in XMD code due to improper memory management (gh#fedora-modularity/libmodulemd#274) + + Fix assorted documentation issues +- Disable executing test suite on ARM and RISC-V due to performance issues with builders + +--- Old: modulemd-2.3.0.tar.xz New: modulemd-2.3.1.tar.xz Other differences: -- ++ libmodulemd.spec ++ --- /var/tmp/diff_new_pack.hW6wcH/_old 2019-05-12 11:44:54.835896161 +0200 +++ /var/tmp/diff_new_pack.hW6wcH/_new 2019-05-12 11:44:54.835896161 +0200 @@ -18,7 +18,7 @@ %global majorversion 2 %global minorversion 3 -%global patchversion 0 +%global patchversion 1 %global majorminorversion %{majorversion}.%{minorversion} %global nsversion %{majorversion}.0 @@ -31,7 +31,7 @@ # Legacy modulemd API %global oldmajorver 1 %global oldminorver 8 -%global oldpatchver 7 +%global oldpatchver 8 %global oldmajorminorver %{oldmajorver}.%{oldminorver} %global oldnsver %{oldmajorver}.0 @@ -41,7 +41,6 @@ %global olddevname %{name}%{oldmajorver}-devel %global oldgirname typelib-1_0-Modulemd-%{oldmajorver}_0 - Name: libmodulemd Version:%{libmodulemd_version} Release:0 @@ -158,7 +157,11 @@ %check export LC_CTYPE=C.utf8 +# Don't run tests on ARM and RISC-V for now. There are problems +# with performance on the builders and often these time out. +%ifnarch %{arm} aarch64 riscv64 %meson_test +%endif %install %meson_install ++ modulemd-2.3.0.tar.xz -> modulemd-2.3.1.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modulemd-2.3.0/.travis/coverity_prep.sh new/modulemd-2.3.1/.travis/coverity_prep.sh --- old/modulemd-2.3.0/.travis/coverity_prep.sh 2019-04-23 02:15:08.0 +0200 +++ new/modulemd-2.3.1/.travis/coverity_prep.sh 2019-05-03 14:21:00.0 +0200 @@ -3,6 +3,9 @@ set -x echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca- +curl -s -L https://entrust.com/root-certificates/entrust_l1k.cer | tee -a /etc/pki/ca-trust/source/anchors/entrust_l1k.cer +sudo update-ca-trust + curl -s https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh -o /usr/bin/travisci_build_coverity_scan.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modulemd-2.3.0/README.md new/modulemd-2.3.1/README.md --- old/modulemd-2.3.0/README.md2019-04-23 02:15:08.0 +0200 +++ new/modulemd-2.3.1/README.md2019-05-03 14:21:00.0 +0200 @@ -18,6 +18,10 @@ from gi.repository import Modulemd ``` +It's highly recommended that you install `python2-libmodulemd` or +`python3-libmodulemd`, which will seamlessly translate GLib Variants to native +Python objects and vice-versa. + # Working with repodata (DNF use-case) The libmodulemd API provides a number of convenience tools for interacting with repodata (that is, streams of YAML that contains information on multiple @@ -185,9 +189,10 @@ ## Python ```python stream = Modulemd.ModuleStream.read_file ('/path/to/module_name.yaml', + True, module_name, stream_name) -v2_stream = stream.upgrade(Modulemd.ModuleStreamVersion.TWO) +v2_stream = stream.upgrade(Modulemd.ModuleStreamVersionEnum.TWO) v2_stream.validate() ``` In the example above, we upgraded the stream to v2, in case we were reading from v1 metadata. This will allow us to avoid having to manage multiple code-paths and support only the latest we understand. After that, it calls validate() to ensure that the content that was read in was valid both syntactically and referentially. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modulemd-2.3.0/bindings/pytho
commit libmodulemd for openSUSE:Factory
Hello community, here is the log from the commit of package libmodulemd for openSUSE:Factory checked in at 2019-04-30 13:05:16 Comparing /work/SRC/openSUSE:Factory/libmodulemd (Old) and /work/SRC/openSUSE:Factory/.libmodulemd.new.5536 (New) Package is "libmodulemd" Tue Apr 30 13:05:16 2019 rev:4 rq:698915 version:unknown Changes: --- /work/SRC/openSUSE:Factory/libmodulemd/libmodulemd.changes 2019-04-23 14:36:58.201509451 +0200 +++ /work/SRC/openSUSE:Factory/.libmodulemd.new.5536/libmodulemd.changes 2019-04-30 13:05:20.353937894 +0200 @@ -1,0 +2,5 @@ +Sun Apr 28 14:06:18 UTC 2019 - Neal Gompa + +- Add missing dependency on six module for Python 3 bindings subpackage + +--- Other differences: -- ++ libmodulemd.spec ++ --- /var/tmp/diff_new_pack.Ttu6Mg/_old 2019-04-30 13:05:21.061937254 +0200 +++ /var/tmp/diff_new_pack.Ttu6Mg/_new 2019-04-30 13:05:21.065937251 +0200 @@ -80,6 +80,7 @@ Group: Development/Libraries/Python Requires: %{girname}%{?_isa} = %{libmodulemd_version}-%{release} Requires: python3-gobject +Requires: python3-six %description -n python3-%{name} This package provides the Python 3 bindings for %{name}.
commit libmodulemd for openSUSE:Factory
Hello community, here is the log from the commit of package libmodulemd for openSUSE:Factory checked in at 2019-04-23 14:36:55 Comparing /work/SRC/openSUSE:Factory/libmodulemd (Old) and /work/SRC/openSUSE:Factory/.libmodulemd.new.5536 (New) Package is "libmodulemd" Tue Apr 23 14:36:55 2019 rev:3 rq:696921 version:unknown Changes: --- /work/SRC/openSUSE:Factory/libmodulemd/libmodulemd.changes 2019-04-01 12:39:48.225956522 +0200 +++ /work/SRC/openSUSE:Factory/.libmodulemd.new.5536/libmodulemd.changes 2019-04-23 14:36:58.201509451 +0200 @@ -1,0 +2,14 @@ +Tue Apr 23 03:54:08 UTC 2019 - Neal Gompa + +- Update to 2.3.0 (v2) and 1.8.7 (v1) + + Add ModuleIndex.update_from_custom() + + Add ModuleIndex.dump_to_custom() + + Add Component.equals() + + Add Module.remove_streams_by_NSVCA() + + Fix bug with emitting lists of scalars in XMD + + Fix bug with deduplication in the ModuleIndexMerger + + Fix serious memory leak +- Drop patch included in upstream release + * 0001-Only-require-python2-if-installing-overrides.patch + +--- Old: 0001-Only-require-python2-if-installing-overrides.patch modulemd-2.2.2.tar.xz New: modulemd-2.3.0.tar.xz Other differences: -- ++ libmodulemd.spec ++ --- /var/tmp/diff_new_pack.RCBEIc/_old 2019-04-23 14:36:59.297510181 +0200 +++ /var/tmp/diff_new_pack.RCBEIc/_new 2019-04-23 14:36:59.301510184 +0200 @@ -17,8 +17,8 @@ %global majorversion 2 -%global minorversion 2 -%global patchversion 2 +%global minorversion 3 +%global patchversion 0 %global majorminorversion %{majorversion}.%{minorversion} %global nsversion %{majorversion}.0 @@ -31,7 +31,7 @@ # Legacy modulemd API %global oldmajorver 1 %global oldminorver 8 -%global oldpatchver 5 +%global oldpatchver 7 %global oldmajorminorver %{oldmajorver}.%{oldminorver} %global oldnsver %{oldmajorver}.0 @@ -51,9 +51,6 @@ URL:https://github.com/fedora-modularity/libmodulemd Source0: %{url}/releases/download/%{name}-%{libmodulemd_version}/modulemd-%{libmodulemd_version}.tar.xz -# Backports from upstream -Patch0001: 0001-Only-require-python2-if-installing-overrides.patch - BuildRequires: meson >= 0.46.0 BuildRequires: gcc BuildRequires: pkgconfig(gobject-2.0) ++ modulemd-2.2.2.tar.xz -> modulemd-2.3.0.tar.xz ++ 9383 lines of diff (skipped)
commit libmodulemd for openSUSE:Factory
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 + +- 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 Date: Thu, 28 Mar 2019 10:24:04 -0400 Subject: [PATCH] Only require python2 if installing overrides Signed-off-by: Stephen Gallagher --- 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 B