Compare commits

..

No commits in common. "2a009a416c050b6936ba8615fe62ddaf2c8e8236" and "fcd7279211fcb9ce1a73b16da69819b735a53fa2" have entirely different histories.

5 changed files with 41 additions and 51 deletions

View File

@ -0,0 +1,30 @@
From 7b5fd50da51462bb98d1e8e9916562bbf645b545 Mon Sep 17 00:00:00 2001
From: fangyufa <fangyufa1@huawei.com>
Date: Fri, 22 Nov 2019 17:46:29 +0800
Subject: [PATCH] libmodulemd: disable valgrind test for build
Change-Id: I4bc4973d32b42b092a3293ff55e74bf9e6e69596
Signed-off-by: fangyufa <fangyufa1@huawei.com>
---
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 c7d42e8..8ffe46e 100644
--- a/modulemd/meson.build
+++ b/modulemd/meson.build
@@ -27,9 +27,9 @@ endif
valgrind = find_program('valgrind', required: developer_build)
-if not valgrind.found()
+#if not valgrind.found()
valgrind = disabler()
-endif
+#endif
build_api_v1 = get_option('build_api_v1')
--
2.19.1

View File

@ -1,18 +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.13.0
Release: 3
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/%{version}/modulemd-%{version}.tar.xz
Source0: https://github.com/fedora-modularity/libmodulemd/releases/download/libmodulemd-%{version}/modulemd-%{version}.tar.xz
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}
BuildRequires: valgrind
%endif
Patch9000: libmodulemd-disable-valgrind-test-for-build.patch
BuildRequires: meson pkgconfig gcc python3-gobject-base valgrind gobject-introspection-devel libxslt
BuildRequires: pkgconfig(gobject-2.0) pkgconfig(gobject-introspection-1.0) pkgconfig(yaml-0.1) pkgconfig(gtk-doc)
%description
@ -28,19 +25,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 -Dwith_py2=false
%meson -Ddeveloper_build=false
%meson_build
@ -62,49 +53,22 @@ 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
* Thu Nov 17 2022 yixiangzhike <yixiangzhike007@163.com> - 2.13.0-3
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:fix source url
* Wed Jun 22 2022 fuanan <fuanan3@h-partners.com> - 2.13.0-2
- Type:requirement
- ID:NA
- SUG:NA
- DESC:fix build error:Unknow options:"developer_build"
* Tue Jul 27 2021 zoulin <zoulin13@huawei.com> - 2.13.0-1
- Type:requirement
- ID:NA
- SUG:NA
- DESC:update libmodulemd version to 2.13.0
* 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
- add buildrequires of libxslt(for x86_64) and disable valgrind test for build

View File

@ -1,4 +0,0 @@
version_control: github
src_repo: fedora-modularity/libmodulemd
tag_prefix: ^libmodlemd-
seperator: .

BIN
modulemd-1.6.4.tar.xz Normal file

Binary file not shown.

Binary file not shown.