From 3aac3a0be990454cc27d6a5547c9a20a3ec09640 Mon Sep 17 00:00:00 2001 From: Florian Festi Date: Thu, 11 May 2023 16:33:02 +0200 Subject: [PATCH] Add compat links and Provides or building dnf and friends --- rpm.spec | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/rpm.spec b/rpm.spec index f0b08d6..cf5091c 100644 --- a/rpm.spec +++ b/rpm.spec @@ -32,8 +32,9 @@ %global rpmver 4.18.90 #global snapver rc1 -%global baserelease 1 +%global baserelease 2 %global sover 10 +%global oldsover 9 %global srcver %{rpmver}%{?snapver:-%{snapver}} %global srcdir %{?snapver:testing}%{!?snapver:rpm-%(echo %{rpmver} | cut -d'.' -f1-2).x} @@ -175,6 +176,17 @@ Requires(meta): %{name} = %{version}-%{release} Requires: rpm-sequoia%{_isa} >= 1.4.0 %endif + +# XXX dirty temporary hack to "bootstrap" new .so version +# XXX isa bits isn't quite right for multilib but suffices for this purpose +%if %{__isa_bits} == 64 +Provides: librpmio.so.%{oldsover}()(64bit) +Provides: librpm.so.%{oldsover}()(64bit) +%else +Provides: librpmio.so.%{oldsover} +Provides: librpm.so.%{oldsover} +%endif + %description libs This package contains the RPM shared libraries. @@ -395,6 +407,10 @@ cd _build # as it is currently in systemd-rpm-macros rm $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/sysusers.attr +# XXX dirty temporary hack to "bootstrap" new .so version +ln -s librpmio.so.%{sover} $RPM_BUILD_ROOT/%{_libdir}/librpmio.so.%{oldsover} +ln -s librpm.so.%{sover} $RPM_BUILD_ROOT/%{_libdir}/librpm.so.%{oldsover} + cd .. mkdir -p $RPM_BUILD_ROOT%{_unitdir} @@ -526,6 +542,8 @@ fi %{_libdir}/librpm.so.%{sover} %{_libdir}/librpmio.so.%{sover}.* %{_libdir}/librpm.so.%{sover}.* +%{_libdir}/librpmio.so.%{oldsover} +%{_libdir}/librpm.so.%{oldsover} %if %{with plugins} %dir %{_libdir}/rpm-plugins @@ -628,6 +646,9 @@ fi %doc %{_defaultdocdir}/rpm/API/ %changelog +* Thu May 11 2023 Florian Festi - 4.18.90-2 +- Add compat links for building dnf and friends + * Thu May 04 2023 Florian Festi - 4.18.90-1 - Update to 4.19 alpha