From 34e22c6adab20edfdf50faa92dff054db86b6cf6 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Dec 03 2024 21:28:02 +0000 Subject: Dynamically generate required symlinks Historically when upstream adds new scripts it takes us a while to notice and update the specfile to include them. With this, when upstream adds a new script this will automatically pick it up and generate the required symlink into the bindir so it can be found in the expected place. This also makes the symlinks relative, which fixes an rpm warning about absolute symlinks. --- diff --git a/SPECS/rabbitmq-server.spec b/SPECS/rabbitmq-server.spec index 192d3bc..ad188f3 100644 --- a/SPECS/rabbitmq-server.spec +++ b/SPECS/rabbitmq-server.spec @@ -7,7 +7,7 @@ Name: rabbitmq-server Version: 3.9.21 -Release: 1%{?dist} +Release: 2%{?dist} License: MPLv1.1 Source0: https://github.com/rabbitmq/rabbitmq-server/releases/download/v%{version}/%{name}_%{version}.orig.tar.xz Source1: https://github.com/rabbitmq/rabbitmq-server/releases/download/v%{version}/%{name}_%{version}.orig.tar.xz.asc @@ -98,8 +98,8 @@ install -p -D -m 0755 ./scripts/rabbitmq-script-wrapper %{buildroot}%{_sbindir}/ # Make necessary symlinks mkdir -p %{buildroot}%{_rabbit_libdir}/bin -for app in rabbitmq-defaults rabbitmq-env rabbitmq-plugins rabbitmq-diagnostics rabbitmq-server rabbitmqctl ; do - ln -s %{_rabbit_libdir}/lib/rabbitmq_server-%{version}/sbin/${app} %{buildroot}%{_rabbit_libdir}/bin/${app} +for app in $(basename -a %{buildroot}%{_rabbit_libdir}/lib/rabbitmq_server-%{version}/sbin/*); do + ln -s ../lib/rabbitmq_server-%{version}/sbin/${app} %{buildroot}%{_rabbit_libdir}/bin/${app} done install -p -D -m 0755 %{S:3} %{buildroot}%{_rabbit_libdir}/bin/cuttlefish @@ -182,6 +182,10 @@ done %changelog +* Tue Dec 3 2024 John Eckersberg - 3.9.21-2 +- Cherry-pick fedora patch to enable rabbitmq-queues +- https://src.fedoraproject.org/rpms/rabbitmq-server/c/8b17ff329f19598f647584c0f0b5448d74a56e7b + * Tue Jul 12 2022 Peter Lemenkov - 3.9.21-1 - Ver. 3.9.21