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