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

Use distro-configured debuginfod server

Browse Source 
Fedora and CentOS configure a debuginfod server by default, whereas RHEL
and Amazon Linux do not.  The new `dist_debuginfod_url` macro sets the
server URL in a central place.  Use that value, if defined, to configure
with a default server.  If unset, do not configure one.

This ensures we have a unified spec file for all distro variants, and
distro-specific config resides in the macros.dist file.

With this change, we do not need the recently-added bcond for
with_debuginfo_url, so drop it.

Signed-off-by: Amit Shah <amitshah@fedoraproject.org>
This commit is contained in:
Amit Shah 2022-08-01 12:35:18 +05:30 committed by Amit Shah
parent 3e1f9c3f60
commit 17c16efeeb
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
elfutils.spec
View File

@ -1,6 +1,6 @@
Name: elfutils Name: elfutils
Version: 0.187 Version: 0.187
%global baserelease 8 %global baserelease 9
Release: %{baserelease}%{?dist} Release: %{baserelease}%{?dist}
URL: http://elfutils.org/ URL: http://elfutils.org/
%global source_url ftp://sourceware.org/pub/elfutils/%{version}/ %global source_url ftp://sourceware.org/pub/elfutils/%{version}/
@ -68,8 +68,6 @@ BuildRequires: gettext-devel
%global with_sysusers 1 %global with_sysusers 1
%endif %endif
%bcond with_debuginfod_url 1
# Patches # Patches
# For s390x... FDO package notes are bogus. # For s390x... FDO package notes are bogus.
@ -277,8 +275,11 @@ RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -Wformat"
trap 'cat config.log' EXIT trap 'cat config.log' EXIT
%if %{with with_debuginfod_url} # dist_debuginfod_url is defined in macros.dist. Fedora and CentOS have
%configure CFLAGS="$RPM_OPT_FLAGS" --enable-debuginfod-urls=https://debuginfod.fedoraproject.org/ # URLs pointing to their respective servers. RHEL and Amazon Linux do
# not configure a default server.
%if "%{?dist_debuginfod_url}"
%configure CFLAGS="$RPM_OPT_FLAGS" --enable-debuginfod-urls=%{dist_debuginfod_url}
%else %else
%configure CFLAGS="$RPM_OPT_FLAGS" %configure CFLAGS="$RPM_OPT_FLAGS"
%endif %endif
@ -405,7 +406,7 @@ fi
%{_mandir}/man1/debuginfod-find.1* %{_mandir}/man1/debuginfod-find.1*
%{_mandir}/man7/debuginfod*.7* %{_mandir}/man7/debuginfod*.7*
%config(noreplace) %{_sysconfdir}/profile.d/* %config(noreplace) %{_sysconfdir}/profile.d/*
%if %{with with_debuginfod_url} %if "%{?dist_debuginfod_url}"
%config(noreplace) %{_sysconfdir}/debuginfod/* %config(noreplace) %{_sysconfdir}/debuginfod/*
%endif %endif
@ -446,6 +447,9 @@ exit 0
%systemd_postun_with_restart debuginfod.service %systemd_postun_with_restart debuginfod.service
%changelog %changelog
* Wed Oct 5 2022 Amit Shah <amitshah@fedoraproject.org> - 0.187-9
- Auto-configure debuginfod_url based on macros.dist
* Wed Aug 24 2022 Debarshi Ray <rishi@fedoraproject.org> - 0.187-8 * Wed Aug 24 2022 Debarshi Ray <rishi@fedoraproject.org> - 0.187-8
- Use %%sysusers_requires_compat to match %%sysusers_create_compat - Use %%sysusers_requires_compat to match %%sysusers_create_compat