From c7d5ffda99a66cf7b9debe29c4afa00126516c30 Mon Sep 17 00:00:00 2001 From: Heitor Moreira da Silva Date: Sat, 26 Oct 2024 15:42:38 -0300 Subject: [PATCH] [openSUSE][RPM] The qemu translation is not being installed (boo#1231166) Use the %lang_package macro for qemu-lang and some rpmlint fixes --- rpm/qemu.spec | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/rpm/qemu.spec b/rpm/qemu.spec index b47ca7ce29..125feea5c2 100644 --- a/rpm/qemu.spec +++ b/rpm/qemu.spec @@ -262,7 +262,6 @@ Suggests: qemu-block-iscsi Suggests: qemu-block-ssh Suggests: qemu-chardev-baum Suggests: qemu-extra -Suggests: qemu-lang Suggests: qemu-microvm Suggests: qemu-skiboot Suggests: qemu-vhost-user-gpu @@ -314,6 +313,8 @@ Suggests: qemu-extra This package acts as an umbrella package to the other QEMU sub-packages. +%lang_package + %files %if %{kvm_available} %ifarch s390x @@ -888,17 +889,17 @@ done # Upstream provides services for qemu-pr-helper. So far, we've not needed # them, so let's continue not to ship them for now. If that changes, just -# uncomment these lines (and the ones in the %file pr-helper section) -#install -m 0644 contrib/systemd/qemu-pr-helper.service %{buildroot}%{_unitdir} -#install -m 0644 contrib/systemd/qemu-pr-helper.socket %{buildroot}%{_unitdir} +# uncomment these lines (and the ones in the %%file pr-helper section) +#install -m 0644 contrib/systemd/qemu-pr-helper.service %%{buildroot}%%{_unitdir} +#install -m 0644 contrib/systemd/qemu-pr-helper.socket %%{buildroot}%%{_unitdir} %if 0%{with vmsr_helper} echo "" # Upstream provides services for qemu-vmsr-helper. So far, we've not needed # them, so let's continue not to ship them for now. If that changes, just -# uncomment these lines (and the ones in the %file vmsr-helper section) -#install -m 0644 contrib/systemd/qemu-vmsr-helper.service %{buildroot}%{_unitdir} -#install -m 0644 contrib/systemd/qemu-vmsr-helper.socket %{buildroot}%{_unitdir} +# uncomment these lines (and the ones in the %%file vmsr-helper section) +#install -m 0644 contrib/systemd/qemu-vmsr-helper.service %%{buildroot}%%{_unitdir} +#install -m 0644 contrib/systemd/qemu-vmsr-helper.socket %%{buildroot}%%{_unitdir} %endif %suse_update_desktop_file qemu @@ -1210,15 +1211,6 @@ popular QEMU packages which are dedicated to a single architecture.) %_datadir/%name/QEMU,cgthree.bin %_datadir/%name/QEMU,tcx.bin -%package lang -Summary: Translations for QEMU -Group: System/Emulators/PC - -%description lang -This package contains a few language translations, particularly for the -graphical user interface components that come with QEMU. The bulk of strings -in QEMU are not localized. - %files lang -f %blddir/%name.lang %package audio-alsa @@ -1579,8 +1571,8 @@ This package provides a helper utility for SCSI persistent reservations. %files pr-helper %_bindir/qemu-pr-helper -#%{_unitdir}/qemu-pr-helper.service -#%{_unitdir}/qemu-pr-helper.socket +#%%{_unitdir}/qemu-pr-helper.service +#%%{_unitdir}/qemu-pr-helper.socket %_mandir/man8/qemu-pr-helper.8.gz %if 0%{with vmsr_helper} @@ -1593,8 +1585,8 @@ This package provides a helper utility for letting VMs access the RAPL (Running %files vmsr-helper %_bindir/qemu-vmsr-helper -#%{_unitdir}/qemu-vmsr-helper.service -#%{_unitdir}/qemu-vmsr-helper.socket +#%%{_unitdir}/qemu-vmsr-helper.service +#%%{_unitdir}/qemu-vmsr-helper.socket %endif %package tools