diff --git a/libmodulemd-disable-valgrind-test-for-build.patch b/libmodulemd-disable-valgrind-test-for-build.patch index aedcd46e31b71958cc6b988331d8b12aafb6cae8..081fef9d645ebf699f0d53fcd1587e2b9ed85bcc 100644 --- a/libmodulemd-disable-valgrind-test-for-build.patch +++ b/libmodulemd-disable-valgrind-test-for-build.patch @@ -1,28 +1,30 @@ -From 31383ba84f9a2fa1bcae6a38e5a43dd3abdee587 Mon Sep 17 00:00:00 2001 -From: sherlock2010 <15151851377@163.com> -Date: Sat, 25 Jul 2020 15:07:47 +0800 -Subject: [PATCH 2/2] decond commit +From 7b5fd50da51462bb98d1e8e9916562bbf645b545 Mon Sep 17 00:00:00 2001 +From: fangyufa +Date: Fri, 22 Nov 2019 17:46:29 +0800 +Subject: [PATCH] libmodulemd: disable valgrind test for build +Change-Id: I4bc4973d32b42b092a3293ff55e74bf9e6e69596 +Signed-off-by: fangyufa --- - modulemd/meson.build | 4 ++-- + modulemd-1.6.4/modulemd/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modulemd/meson.build b/modulemd/meson.build -index 8b3d543..b9d7549 100644 +index c7d42e8..8ffe46e 100644 --- a/modulemd/meson.build +++ b/modulemd/meson.build -@@ -48,9 +48,9 @@ endif - if developer_build - valgrind = find_program('valgrind') +@@ -27,9 +27,9 @@ endif -- if not valgrind.found() -+# if not valgrind.found() - valgrind = disabler() -- endif -+# endif - else + valgrind = find_program('valgrind', required: developer_build) + +-if not valgrind.found() ++#if not valgrind.found() valgrind = disabler() - endif +-endif ++#endif + + build_api_v1 = get_option('build_api_v1') + -- -1.8.3.1 +2.19.1 diff --git a/libmodulemd.spec b/libmodulemd.spec index da65bc6d7c8446f93d6313978ca9c28933c8b0e1..ee8631a4886be4e423475262282d53a8dad4be08 100644 --- a/libmodulemd.spec +++ b/libmodulemd.spec @@ -1,16 +1,15 @@ # NOTICE: this spec file is retrieved from upper stream project(see libmodulemd.spec.in in Source0) # and made some modifications. Name: libmodulemd -Version: 2.9.4 -Release: 1 +Version: 1.6.4 +Release: 4 Summary: C Library for manipulating module metadata files License: MIT URL: https://github.com/fedora-modularity/libmodulemd Source0: https://github.com/fedora-modularity/libmodulemd/releases/download/libmodulemd-%{version}/modulemd-%{version}.tar.xz Patch9000: libmodulemd-disable-valgrind-test-for-build.patch -BuildRequires: meson pkgconfig gcc gcc-c++ gobject-introspection-devel libxslt -Buildrequires: python3-devel python3-gobject-base glib2-doc rpm-devel file-devel help2man +BuildRequires: meson pkgconfig gcc python3-gobject-base gobject-introspection-devel libxslt %ifarch %{valgrind_arches} BuildRequires: valgrind %endif @@ -29,19 +28,13 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description devel Development files for libmodulemd. -%package -n python3-%{name} -Summary: python3 bindings for %{name} -Requires: %{name} = %{version}-%{release} python3-gobject-base python3-six - -%description -n python3-%{name} -python3 bindings for %{name} %prep %autosetup -p1 -n modulemd-%{version} %build -%meson -Ddeveloper_build=false -Dwith_py2=false +%meson -Ddeveloper_build=false %meson_build @@ -63,25 +56,28 @@ export LC_CTYPE=C.utf8 %license COPYING %doc README.md %{_bindir}/modulemd-validator -%{_libdir}/%{name}.so.2* +%{_libdir}/%{name}.so.1* %dir %{_libdir}/girepository-1.0 %{_libdir}/girepository-1.0/Modulemd* -%{_mandir}/man1/modulemd-validator* + %files devel %{_libdir}/%{name}.so -%{_libdir}/pkgconfig/modulemd-2.0.pc -%{_includedir}/modulemd-2.0/ +%{_libdir}/pkgconfig/modulemd.pc +%{_includedir}/modulemd/ %dir %{_datadir}/gir-1.0 %{_datadir}/gir-1.0/Modulemd* %dir %{_datadir}/gtk-doc %dir %{_datadir}/gtk-doc/html -%{_datadir}/gtk-doc/html/modulemd-2.0/ - -%files -n python3-%{name} -%{python3_sitearch}/gi/overrides/ +%{_datadir}/gtk-doc/html/modulemd-1.0/ %changelog +* Sat Aug 1 2020 Liquor - 1.6.4-4 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:revert "update libmodulemd version to 2.9.4" + * Tue Apr 28 2020 zhouyihang - 2.9.4-1 - Type:requirement - ID:NA diff --git a/modulemd-1.6.4.tar.xz b/modulemd-1.6.4.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..76c724f2af8e2969fb60a3f6c8688b1a0c034d88 Binary files /dev/null and b/modulemd-1.6.4.tar.xz differ diff --git a/modulemd-2.9.4.tar.xz b/modulemd-2.9.4.tar.xz deleted file mode 100644 index 555aa224a688c212ff538343c348dedb0f8f73bf..0000000000000000000000000000000000000000 Binary files a/modulemd-2.9.4.tar.xz and /dev/null differ