rpms/osbuild
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 105

Browse Source 
Resolves: RHEL-1035
This commit is contained in:
imagebuilder-bot 2024-01-31 10:03:57 +00:00
parent 56f6146b16
commit 2386ce6980
3 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -91,3 +91,4 @@
/osbuild-102.tar.gz /osbuild-102.tar.gz
/osbuild-103.tar.gz /osbuild-103.tar.gz
/osbuild-104.tar.gz /osbuild-104.tar.gz
/osbuild-105.tar.gz

27
osbuild.spec
View File

@ -1,7 +1,7 @@
%global forgeurl https://github.com/osbuild/osbuild %global forgeurl https://github.com/osbuild/osbuild
%global selinuxtype targeted %global selinuxtype targeted
Version: 104 Version: 105
%forgemeta %forgemeta
@ -9,20 +9,12 @@ Version: 104
%global pkgdir %{_prefix}/lib/%{pypi_name} %global pkgdir %{_prefix}/lib/%{pypi_name}
Name: %{pypi_name} Name: %{pypi_name}
Release: 2%{?dist} Release: 1%{?dist}
License: Apache-2.0 License: Apache-2.0
URL: %{forgeurl} URL: %{forgeurl}
Source0: %{forgesource} Source0: %{forgesource}
# https://github.com/osbuild/osbuild/pull/1539
Patch0: PR1539.patch
# https://github.com/osbuild/osbuild/pull/1540
Patch1: PR1540.patch
# https://github.com/osbuild/osbuild/pull/1541
Patch2: PR1541.patch
BuildArch: noarch BuildArch: noarch
Summary: A build system for OS images Summary: A build system for OS images
@ -139,6 +131,13 @@ manifests and osbuild.
Summary: Dependency solving support for DNF Summary: Dependency solving support for DNF
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
# Fedora 40 and later use libdnf5, RHEL and Fedora < 40 use libdnf
%if 0%{?fedora} >= 40
Requires: python3-libdnf5 >= 5.1.1
%else
Requires: python3-libdnf
%endif
%description depsolve-dnf %description depsolve-dnf
Contains depsolving capabilities for package managers. Contains depsolving capabilities for package managers.
@ -208,7 +207,12 @@ install -p -m 0755 data/10-osbuild-inhibitor.rules %{buildroot}%{_udevrulesdir}
# Install `osbuild-depsolve-dnf` into libexec # Install `osbuild-depsolve-dnf` into libexec
mkdir -p %{buildroot}%{_libexecdir} mkdir -p %{buildroot}%{_libexecdir}
# Fedora 40 and later use dnf5-json, RHEL and Fedora < 40 use dnf-json
%if 0%{?fedora} >= 40
install -p -m 0755 tools/osbuild-depsolve-dnf5 %{buildroot}%{_libexecdir}/osbuild-depsolve-dnf
%else
install -p -m 0755 tools/osbuild-depsolve-dnf %{buildroot}%{_libexecdir}/osbuild-depsolve-dnf install -p -m 0755 tools/osbuild-depsolve-dnf %{buildroot}%{_libexecdir}/osbuild-depsolve-dnf
%endif
%check %check
exit 0 exit 0
@ -286,6 +290,9 @@ fi
%{_libexecdir}/osbuild-depsolve-dnf %{_libexecdir}/osbuild-depsolve-dnf
%changelog %changelog
* Wed Jan 31 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 105-1
- New upstream release
* Wed Jan 17 2024 Paweł Poławski <ppolawsk@redhat.com> - 104-2 * Wed Jan 17 2024 Paweł Poławski <ppolawsk@redhat.com> - 104-2
- Fix unit tests in RHEL CI by backporting upstream fixes - Fix unit tests in RHEL CI by backporting upstream fixes

2
sources
View File

@ -1 +1 @@
SHA512 (osbuild-104.tar.gz) = cc7d566f81007e294a6af0947fdbd5d740f63f7e49833c9576793b6d22a03d4d131508b16d3df4d6e79ae9d7037babf1cae4f3d007e1527d7f141f9d60ebd084 SHA512 (osbuild-105.tar.gz) = c0278513ee1ed444eb1eaeeb726bfef580666a689451622b181697997da040feee34da93a1e5468b29944031c6090b2a72e99f34d1817ca54a537278fc866749