update to 2.15.0

source renamed from modulemd to libmodulemd [release 2.15.0-1mamba;Wed Oct 18 2023]
This commit is contained in:
Silvan Calarco 2024-01-06 05:05:05 +01:00
parent 98280b07f6
commit 6e01d9bce5
3 changed files with 212 additions and 0 deletions

View File

@ -1,2 +1,5 @@
# libmodulemd # libmodulemd
C Library for manipulating module metadata files.
This package contains shared libraries for libmodulemd.

128
libmodulemd.spec Normal file
View File

@ -0,0 +1,128 @@
Name: libmodulemd
Version: 2.15.0
Release: 1mamba
Summary: C Library for manipulating module metadata files
Group: System/Libraries
Vendor: openmamba
Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: https://github.com/fedora-modularity/libmodulemd
Source: https://github.com/fedora-modularity/libmodulemd.git/%{version}/libmodulemd-%{version}.tar.bz2
Patch0: modulemd-2.10.0-upstream-fix-build-on-32bit-archs.patch
License: MIT
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
BuildRequires: libglib-devel
BuildRequires: libpython311-devel
BuildRequires: librpm-devel
BuildRequires: libyaml-devel
## AUTOBUILDREQ-END
BuildRequires: python3 >= 3.11
BuildRequires: librpm-devel >= 4.16.1.2-1mamba
BuildRequires: python-autopep8-py3
BuildRequires: pygobject-py3
BuildRequires: pycodestyle-py3
BuildRequires: glib-apidocs
Requires: python-autopep8-py3
%description
C Library for manipulating module metadata files.
This package contains shared libraries for %{name}.
%package devel
Group: Development/Libraries
Summary: Development files for %{name}
Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release}
Requires: pkg-config
%description devel
This package contains libraries and header files for developing applications that use %{name}.
%package -n modulemd
Group: System/Tools
Summary: Tools provided with %{name}
Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release}
%description -n modulemd
This package contains the tools provided with %{name}.
%debug_package
%prep
%setup -q
#%patch0 -p1
%build
%meson \
-Dpython_name=%{__python3}
# -Dbuild_api_v1=true \
%meson_build
%install
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
%meson_install
#sed -i "s|lmodulemd|l:libmodulemd.so.1|" %{buildroot}%{_libdir}/pkgconfig/modulemd.pc
%clean
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root)
%{_libdir}/libmodulemd.so.*
%{_libdir}/girepository-1.0/Modulemd-2.0.typelib
%{python3_sitearch}/gi/overrides/Modulemd.py
%doc COPYING
%files devel
%defattr(-,root,root)
%dir %{_includedir}/modulemd-2.0
%{_includedir}/modulemd-2.0/*
%{_libdir}/libmodulemd.so
%{_libdir}/pkgconfig/modulemd-2.0.pc
%{_datadir}/gir-1.0/Modulemd-2.0.gir
%dir %{_datadir}/gtk-doc/html/modulemd-2.0
%{_datadir}/gtk-doc/html/modulemd-2.0/*
%doc README.md
%files -n modulemd
%defattr(-,root,root)
%{_bindir}/modulemd-validator
%{_mandir}/man1/modulemd-validator.1*
%changelog
* Wed Oct 18 2023 Silvan Calarco <silvan.calarco@mambasoft.it> 2.15.0-1mamba
- update to 2.15.0
- source renamed from modulemd to libmodulemd
* Wed Oct 18 2023 Silvan Calarco <silvan.calarco@mambasoft.it> 2.13.0-2mamba
- rebuilt with python3 == 3.11
* Sun Oct 24 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 2.13.0-1mamba
- update to 2.13.0
* Sun Mar 07 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 2.12.0-2mamba
- rebuilt by autoport with build requirements: librpm-devel>=4.16.1.2-1mamba
* Fri Jan 29 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 2.12.0-1mamba
- update to 2.12.0
* Sat Nov 28 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 2.10.0-1mamba
- update to 2.10.0
* Sat Aug 15 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 2.9.4-1mamba
- update to 2.9.4
* Sat Jun 22 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 2.5.0-1mamba
- update to 2.5.0
* Sun Jun 02 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 2.1.0-1mamba
- update to 2.1.0
* Fri Dec 28 2018 Silvan Calarco <silvan.calarco@mambasoft.it> 2.0.0-1mamba
- package created using the webbuild interface

View File

@ -0,0 +1,81 @@
From 05afb01e3a6de8f09ac664f2d93c3aac9be1e99e Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Fri, 20 Nov 2020 15:52:27 -0500
Subject: [PATCH] Fix integer size issue on 32-bit platforms
Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
---
modulemd/modulemd-module.c | 6 +++---
modulemd/modulemd-obsoletes.c | 7 ++++---
modulemd/modulemd-util.c | 2 +-
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/modulemd/modulemd-module.c b/modulemd/modulemd-module.c
index 8cc79952..1b1ee71e 100644
--- a/modulemd/modulemd-module.c
+++ b/modulemd/modulemd-module.c
@@ -877,8 +877,8 @@ modulemd_module_add_obsoletes (ModulemdModule *self,
continue;
}
g_info (
- "Overriding existing obsolete because of idenical stream: %s, "
- "context: %s and modified time: %lu.",
+ "Overriding existing obsolete because of identical stream: %s, "
+ "context: %s and modified time: %" PRIu64 ".",
modulemd_obsoletes_get_module_stream (obsoletes),
modulemd_obsoletes_get_module_context (obsoletes),
modulemd_obsoletes_get_modified (obsoletes));
@@ -967,7 +967,7 @@ modulemd_module_add_obsoletes (ModulemdModule *self,
g_info (
"Multiple obsoletes for module: %s, stream: %s, context: "
"%s "
- "with identical modified time: %lu",
+ "with identical modified time: %" PRIu64,
modulemd_module_get_module_name (self),
stream_str,
context_str,
diff --git a/modulemd/modulemd-obsoletes.c b/modulemd/modulemd-obsoletes.c
index 46bbc435..ceb7682d 100644
--- a/modulemd/modulemd-obsoletes.c
+++ b/modulemd/modulemd-obsoletes.c
@@ -1092,7 +1092,7 @@ modulemd_obsoletes_emit_yaml (ModulemdObsoletes *self,
error,
MODULEMD_ERROR,
MMD_ERROR_VALIDATE,
- "Cannot convert modified date: %lu to iso8601 date.",
+ "Cannot convert modified date: %" PRIu64 " to iso8601 date.",
modulemd_obsoletes_get_modified (MODULEMD_OBSOLETES (self)));
return FALSE;
}
@@ -1166,7 +1166,8 @@ modulemd_obsoletes_emit_yaml (ModulemdObsoletes *self,
g_set_error (error,
MODULEMD_ERROR,
MMD_ERROR_VALIDATE,
- "Cannot convert eol_date: %lu to iso8601 date.",
+ "Cannot convert eol_date: %" PRIu64
+ " to iso8601 date.",
eol_date);
return FALSE;
}
@@ -1231,7 +1232,7 @@ modulemd_obsoletes_is_active (ModulemdObsoletes *self)
char buf[255];
strftime (buf, sizeof (buf), "%Y%m%d%H%M", tm);
- guint64 now = atol (buf);
+ guint64 now = g_ascii_strtoull (buf, NULL, 0);
if (now >= modulemd_obsoletes_get_eol_date (self))
{
diff --git a/modulemd/modulemd-util.c b/modulemd/modulemd-util.c
index 2a50bb59..7c4c891e 100644
--- a/modulemd/modulemd-util.c
+++ b/modulemd/modulemd-util.c
@@ -521,7 +521,7 @@ modulemd_iso8601date_to_guint64 (const gchar *iso8601)
char buf[32];
strftime (buf, sizeof (buf), "%Y%m%d%H%M", &tm);
- return atol (buf);
+ return g_ascii_strtoull (buf, NULL, 0);
}