$ git diff --patch-with-stat --summary bb7a9addb11a246772b5bf6a883b9ae3d5cdd3c1..683c096ae67c40bf3d492d77eef373c3e258a365
.abf.yml | 2 +-
disable-gtk-doc.patch | 45 -----------------------
libmodulemd.spec | 87 +++++++++-----------------------------------
modulemd-1.7.0-find-sh.patch | 22 -----------
4 files changed, 19 insertions(+), 137 deletions(-)
delete mode 100644 disable-gtk-doc.patch
delete mode 100644 modulemd-1.7.0-find-sh.patch
diff --git a/.abf.yml b/.abf.yml
index 1ee8841..a7a66b2 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
sources:
- modulemd-2.5.0.tar.xz: 2b6c3443a36ec821fd289ae6605e9dea4c5dbcda
+ modulemd-2.8.2.tar.xz: 9846728616cff38995764e9b4315889ecb3d4637
diff --git a/disable-gtk-doc.patch b/disable-gtk-doc.patch
deleted file mode 100644
index d39c728..0000000
--- a/disable-gtk-doc.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 228bd34..f26e2cc 100644
---- a/meson.build
-+++ b/meson.build
-@@ -52,7 +52,6 @@ gnome = import('gnome')
- pkg = import('pkgconfig')
- gobject = dependency('gobject-2.0')
- yaml = dependency('yaml-0.1')
--gtkdoc = dependency('gtk-doc')
-
- sh = find_program('sh')
- sed = find_program('sed')
-diff --git a/modulemd/v1/meson.build b/modulemd/v1/meson.build
-index 74db89a..12416ed 100644
---- a/modulemd/v1/meson.build
-+++ b/modulemd/v1/meson.build
-@@ -340,12 +340,3 @@ configure_file(
- output : 'version.xml',
- configuration : xcdata
- )
--
--gnome.gtkdoc(
-- 'modulemd-1.0',
-- install_dir: 'modulemd-1.0',
-- src_dir : './modulemd/v1',
-- main_xml : 'modulemd-v1-docs.xml',
-- install : true,
--)
--
-diff --git a/modulemd/v2/meson.build b/modulemd/v2/meson.build
-index 7b94e0c..c5f72b9 100644
---- a/modulemd/v2/meson.build
-+++ b/modulemd/v2/meson.build
-@@ -530,11 +530,3 @@ configure_file(
- configuration : xcdata
- )
-
--gnome.gtkdoc(
-- 'modulemd-2.0',
-- install_dir: 'modulemd-2.0',
-- src_dir : './modulemd/v2',
-- main_xml : 'modulemd-v2-docs.xml',
-- install : true,
--)
--
diff --git a/libmodulemd.spec b/libmodulemd.spec
index 5f69009..6e0683f 100644
--- a/libmodulemd.spec
+++ b/libmodulemd.spec
@@ -4,33 +4,28 @@
%define girname %mklibname modulemd-gir %{girapi}
%define devname %mklibname modulemd -d
-# Legacy modulemd API needed for DNF
-%define oldversion 1.8.11
-%define oldmajor 1
-%define oldgirapi %{oldmajor}.0
-%define oldlibname %mklibname modulemd %{oldmajor}
-%define oldgirname %mklibname modulemd-gir %{oldgirapi}
-%define olddevname %mklibname modulemd %{oldmajor} -d
-
-%define newversion 2.5.0
-
%bcond_without gir
%bcond_with gtk-doc
Summary: Library for manipulating module metadata files
Name: libmodulemd
-Version: %{newversion}
+Version: 2.8.2
Release: 1
Group: System/Libraries
License: LGPLv2+
URL: https://github.com/fedora-modularity/%{name}
-Source0: https://github.com/fedora-modularity/libmodulemd/archive/modulemd-%{newversion}.tar.xz
-Patch0: disable-gtk-doc.patch
+Source0: https://github.com/fedora-modularity/libmodulemd/archive/modulemd-%{version}.tar.xz
BuildRequires: meson
+BuildRequires: cmake
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: python3egg(autopep8)
BuildRequires: python3dist(pygobject)
BuildRequires: pkgconfig(yaml-0.1)
+BuildRequires: pkgconfig(rpm)
+BuildRequires: magic-devel
+BuildRequires: /bin/sh
+BuildRequires: sed
+BuildRequires: coreutils
%if %{with gtk-doc}
BuildRequires: gtk-doc
%endif
@@ -74,61 +69,30 @@ This package provides the Python 3 bindings for %{name}.
%description -n %{devname}
Development files for %{name}.
-%package -n %{oldlibname}
-Summary: Main library for %{name} 1.x
-Version: %{oldversion}
-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: %{oldversion}
-Group: System/Libraries
-Requires: %{oldlibname}%{?_isa} = %{oldversion}-%{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: %{oldversion}
-Group: Development/C
-Conflicts: %{devname} <= %{EVRD}
-Provides: %{name}%{oldmajor}-devel = %{oldversion}-%{release}
-Provides: %{name}%{oldmajor}-devel%{?_isa} = %{oldversion}-%{release}
-Provides: modulemd%{oldmajor}-devel = %{oldversion}-%{release}
-Provides: modulemd%{oldmajor}-devel%{?_isa} = %{oldversion}-%{release}
-Requires: %{oldlibname}%{?_isa} = %{oldversion}-%{release}
-Requires: %{oldgirname}%{?_isa} = %{oldversion}-%{release}
-RemovePathPostfixes: .compat
-
-%description -n %{olddevname}
-This package provides files for developing applications to use %{name} 1.x.
-
%prep
-%autosetup -p1 -n modulemd-%{newversion}
+%autosetup -p1 -n modulemd-%{version}
+
+# https://github.com/fedora-modularity/libmodulemd/issues/387
+sed -i -e 's,/usr/bin/sh,/bin/sh,g' modulemd/clang_simple_version.sh
%build
-%meson -Ddeveloper_build=false \
- -Dbuild_api_v1=true \
+%meson \
%if !%{with gir}
-Dskip_introspection=true \
%endif
- -Dbuild_api_v2=true \
+%if %{without gtk-doc}
+ -Dwith_docs=false \
+%endif
+ -Ddeveloper_build=false \
+ -Dwith_py2_overrides=false
%ninja_build -C build
%install
%ninja_install -C build
-ln -s %{_libdir}/%{name}.so.%{oldversion} %{buildroot}%{_libdir}/%{name}.so.compat
%files
%{_bindir}/modulemd-validator
-%{_bindir}/modulemd-validator-v1
%files -n %{libname}
%{_libdir}/%{name}.so.%{major}*
@@ -149,18 +113,3 @@ ln -s %{_libdir}/%{name}.so.%{oldversion} %{buildroot}%{_libdir}/%{name}.so.comp
%files -n python-%{name}
%{py_platsitedir}/gi/overrides/Modulemd.py
%{py_platsitedir}/gi/overrides/__pycache__/Modulemd.*
-
-%files -n %{oldlibname}
-%{_libdir}/%{name}.so.%{oldmajor}*
-
-%files -n %{oldgirname}
-%{_libdir}/girepository-1.0/Modulemd-%{oldgirapi}.typelib
-
-%files -n %{olddevname}
-%{_libdir}/%{name}.so.compat
-%{_libdir}/pkgconfig/modulemd.pc
-%{_includedir}/modulemd/
-%{_datadir}/gir-1.0/Modulemd-%{oldgirapi}.gir
-%if %{with gtk-doc}
-%doc %{_datadir}/gtk-doc/html/modulemd-%{oldgirapi}/
-%endif
diff --git a/modulemd-1.7.0-find-sh.patch b/modulemd-1.7.0-find-sh.patch
deleted file mode 100644
index 7e80d60..0000000
--- a/modulemd-1.7.0-find-sh.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur modulemd-1.7.0/meson.build modulemd-1.7.0.tpg/meson.build
---- modulemd-1.7.0/meson.build 2018-10-26 15:01:36.000000000 +0000
-+++ modulemd-1.7.0.tpg/meson.build 2018-11-06 18:59:12.077940986 +0000
-@@ -51,6 +51,9 @@
- yaml = dependency('yaml-0.1')
- gtkdoc = dependency('gtk-doc')
-
-+sh = find_program('sh')
-+sed = find_program('sed')
-+
- spec_tmpl = find_program('spec_tmpl.sh')
-
- specfile_template = files('libmodulemd.spec.in')
-@@ -72,7 +75,7 @@
- 'specfile',
- capture: true,
- build_always: true,
-- command: [spec_tmpl, meson.project_version(), '@INPUT@'],
-+ command: [sh, spec_tmpl, meson.project_version(), '@INPUT@'],
- input: specfile_template,
- output: 'libmodulemd.spec',
- depends: rpmsetup_target,