From fdd89dbdafca66c76cdcd0dfb199270f4d94e297 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 24 Oct 2022 18:02:42 +0200 Subject: [PATCH] Remove incorrect flatpak conditional Avoid dropping data/hints.ini for flatpak builds as it is equally useful for both flatpak and regular builds. Plus, we can get rid of some spec file complexity. --- prusa-slicer.spec | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/prusa-slicer.spec b/prusa-slicer.spec index 2ce7834..ef3b465 100644 --- a/prusa-slicer.spec +++ b/prusa-slicer.spec @@ -356,9 +356,7 @@ find %buildroot%_datadir/PrusaSlicer/localization -type d | sed ' s:\(.*\):%dir \1: ' >> lang-files -# remove the flatpak data on non flatpak builds %if 0%{?flatpak} -rm -rf %buildroot%_datadir/PrusaSlicer/data/ # Remove udev rules that aren't needed for flatpak builds rm -f %buildroot%_prefix/lib/udev/rules.d/90-3dconnexion.rules %endif @@ -383,10 +381,8 @@ desktop-file-validate %buildroot%_datadir/applications/PrusaGcodeviewer.desktop %_datadir/applications/PrusaSlicer.desktop %_datadir/appdata/%name.appdata.xml %dir %_datadir/PrusaSlicer -%if 0%{?flatpak} -%_datadir/PrusaSlicer/{icons,models,profiles,shaders,shapes,udev,applications}/ -%else %_datadir/PrusaSlicer/{icons,models,profiles,shaders,shapes,udev,applications,data}/ +%if !0%{?flatpak} %_udevrulesdir/90-3dconnexion.rules %endif