Fix systemd/systemd-bootstrap confusion by adding explicit requires (#6236)

* Fix systemd/systemd-bootstrap confusion by adding explicit requires on systemd or systemd-devbel

* systemd-bootchart: fix typo in release

Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>

* iio-sensor-proxy: drop BR pkgconfig(udev)

Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>

* verify license

Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>

* Update cgmanifest for proper samba location

* Update samba source location in spec file

---------

Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
Co-authored-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
This commit is contained in:
jslobodzian 2023-09-20 06:10:52 -07:00 коммит произвёл GitHub
Родитель d76627b897
Коммит 80fea63150
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
7 изменённых файлов: 35 добавлений и 16 удалений

Просмотреть файл

@ -2,7 +2,7 @@ Vendor: Microsoft Corporation
Distribution: Mariner
Name: gnome-desktop-testing
Version: 2018.1
Release: 3%{?dist}
Release: 4%{?dist}
Summary: GNOME test runner for installed tests
License: LGPLv2+
@ -10,7 +10,7 @@ URL: https://live.gnome.org/Initiatives/GnomeGoals/InstalledTests
Source0: https://gitlab.gnome.org/GNOME/%{name}/-/archive/v%{version}/%{name}-v%{version}.tar.gz
BuildRequires: pkgconfig(gio-unix-2.0)
BuildRequires: pkgconfig(libsystemd)
BuildRequires: systemd-devel
BuildRequires: pkgconfig(libgsystem)
BuildRequires: git automake autoconf libtool
@ -39,6 +39,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
%{_bindir}/ginsttest-runner
%changelog
* Tue Sep 19 2023 Jon Slobodzian <joslobo@microsoft.com> - 2018.1-4
- Fix build issue for systemd/systemd-bootstrap confusion
- License verified
* Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 2018.1-3
- Initial CBL-Mariner import from Fedora 32 (license: MIT).

Просмотреть файл

@ -2,7 +2,7 @@ Vendor: Microsoft Corporation
Distribution: Mariner
Name: iio-sensor-proxy
Version: 3.0
Release: 4%{?dist}
Release: 5%{?dist}
Summary: IIO accelerometer sensor to input device proxy
License: GPLv3+
@ -12,8 +12,6 @@ Source0: https://gitlab.freedesktop.org/hadess/%{name}/uploads/de965bcb44
BuildRequires: %{_bindir}/xsltproc
BuildRequires: make
BuildRequires: gcc
BuildRequires: pkgconfig(udev)
BuildRequires: pkgconfig(systemd)
BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(gudev-1.0)
BuildRequires: systemd
@ -66,6 +64,9 @@ This package contains the documentation for %{name}.
%{_datadir}/gtk-doc/html/%{name}/
%changelog
* Tue Sep 19 2023 Jon Slobodzian <joslobo@microsoft.com> - 3.0-5
- Fix build issue for systemd/systemd-bootstrap confusion
* Tue Mar 22 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 3.0-4
- Fixing configuration step in %%build.

Просмотреть файл

@ -1,7 +1,7 @@
Summary: Wireless daemon for Linux
Name: iwd
Version: 1.22
Release: 1%{?dist}
Release: 2%{?dist}
License: LGPLv2+
Vendor: Microsoft Corporation
Distribution: Mariner
@ -15,7 +15,7 @@ BuildRequires: python3-docutils
BuildRequires: readline-devel
BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(ell) >= 0.27
BuildRequires: pkgconfig(libsystemd)
BuildRequires: systemd-devel
Requires: dbus
Requires: systemd
@ -71,6 +71,9 @@ mkdir -p %{buildroot}%{_sharedstatedir}/ead
%changelog
* Tue Sep 19 2023 Jon Slobodzian <joslobo@microsoft.com> - 1.22-2
- Fix build issue for systemd/systemd-bootstrap confusion
* Thu Dec 15 2022 Muhammad Falak <mwani@microsoft.com> - 1.22-1
- License verified

Просмотреть файл

@ -92,7 +92,7 @@
Summary: Scalable High-Availability cluster resource manager
Name: pacemaker
Version: 2.1.5
Release: 4%{?dist}
Release: 5%{?dist}
License: GPLv2+ and LGPLv2+
Url: https://www.clusterlabs.org/
Source0: https://github.com/ClusterLabs/pacemaker/archive/refs/tags/Pacemaker-2.1.5.tar.gz#/%{name}-%{version}.tar.gz
@ -148,7 +148,7 @@ BuildRequires: asciidoc
BuildRequires: inkscape
BuildRequires: %{python_name}-sphinx
%endif
BuildRequires: pkgconfig(systemd)
BuildRequires: systemd
Requires: corosync >= 2.0.0
# Booth requires this
Provides: pacemaker-ticket-support = 2.0
@ -602,6 +602,9 @@ exit 0
%{_datadir}/pkgconfig/pacemaker-schemas.pc
%changelog
* Tue Sep 19 2023 Jon Slobodzian <joslobo@microsoft.com> - 2.1.5-5
- Fix build issue for systemd/systemd-bootstrap confusion
* Wed Mar 08 2023 Sumedh Sharma <sumsharma@microsoft.com> - 2.1.5-4
- Initial CBL-Mariner import from Fedora 37 (license: MIT)
- Disable nagios-plugins-metadata

Просмотреть файл

@ -85,7 +85,7 @@
Name: samba
Version: 4.12.5
Release: 4%{?dist}
Release: 5%{?dist}
%define samba_depver %{version}-%{release}
@ -97,8 +97,8 @@ Distribution: Mariner
URL: https://www.samba.org
# This is a xz recompressed file of https://ftp.samba.org/pub/samba/samba-%%{version}%%{pre_release}.tar.gz
Source0: https://ftp.samba.org/pub/samba/samba-%{version}%{pre_release}.tar.gz#/samba-%{version}%{pre_release}.tar.xz
Source1: https://ftp.samba.org/pub/samba/samba-%{version}%{pre_release}.tar.asc
Source0: https://ftp.samba.org/pub/samba/stable/samba-%{version}%{pre_release}.tar.gz#/samba-%{version}%{pre_release}.tar.xz
Source1: https://ftp.samba.org/pub/samba/stable/samba-%{version}%{pre_release}.tar.asc
Source2: gpgkey-52FBC0B86D954B0843324CDC6F33915B6568B7EA.gpg
# Red Hat specific replacement-files
@ -193,7 +193,7 @@ BuildRequires: xfsprogs-devel
BuildRequires: xz
BuildRequires: zlib-devel >= 1.2.3
BuildRequires: pkgconfig(libsystemd)
BuildRequires: systemd-devel
%if %{with_vfs_glusterfs}
BuildRequires: glusterfs-api-devel >= 3.4.0.16
@ -3436,6 +3436,10 @@ fi
%endif
%changelog
* Tue Sep 19 2023 Jon Slobodzian <joslobo@microsoft.com> - 4.12.5-5
- Fix build issue for systemd/systemd-bootstrap confusion
- License verified
* Mon Nov 01 2021 Muhammad Falak <mwani@microsft.com> - 4.12.5-4
- Remove epoch

Просмотреть файл

@ -2,7 +2,7 @@ Vendor: Microsoft Corporation
Distribution: Mariner
Name: systemd-bootchart
Version: 233
Release: 7%{?dist}
Release: 8%{?dist}
Summary: Boot performance graphing tool
License: GPLv2+ and LGPLv2+
@ -11,7 +11,7 @@ Source0: https://github.com/systemd/%{name}/releases/download/v%{version}
BuildRequires: gcc
BuildRequires: systemd
BuildRequires: pkgconfig(libsystemd) >= 221
BuildRequires: systemd-devel
BuildRequires: %{_bindir}/xsltproc
BuildRequires: docbook-style-xsl
%{?systemd_requires}
@ -54,6 +54,10 @@ are displayed separately.
%{_mandir}/man5/bootchart.conf.d.5*
%changelog
* Tue Sep 19 2023 Jon Slobodzian <joslobo@microsoft.com> - 233-8
- Fix build issue for systemd/systemd-bootstrap confusion
- License verified
* Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 233-7
- Initial CBL-Mariner import from Fedora 32 (license: MIT).

Просмотреть файл

@ -27156,7 +27156,7 @@
"other": {
"name": "samba",
"version": "4.12.5",
"downloadUrl": "https://ftp.samba.org/pub/samba/samba-4.12.5.tar.gz"
"downloadUrl": "https://ftp.samba.org/pub/samba/stable/samba-4.12.5.tar.gz"
}
}
},