diff --git a/blender.spec b/blender.spec index cc0d4d4..1171586 100644 --- a/blender.spec +++ b/blender.spec @@ -45,7 +45,7 @@ URL: https://www.blender.org Source0: https://download.%{name}.org/source/%{name}-%{version}.tar.xz # Upstream separated addons from the main source Source1: https://projects.%{name}.org/%{name}/%{name}-addons/archive/v%{version}.tar.gz#/%{name}-addons-%{version}.tar.gz -Source3: macros.%{name} +Source3: macros.%{name}-rpm # https://projects.blender.org/blender/blender/pulls/106575 Patch: 106575.patch @@ -300,7 +300,7 @@ rm -rf %{buildroot}%{_docdir}/%{name}/* # rpm macros mkdir -p %{buildroot}%{macrosdir} -sed -e 's/@VERSION@/%{blender_api}/g' %{SOURCE1} > %{buildroot}%{macrosdir}/macros.%{name} +sed -e 's/@VERSION@/%{blender_api}/g' %{SOURCE1} > %{buildroot}%{macrosdir}/macros.%{name}-rpm # AppData install -p -m 644 -D release/freedesktop/org.%{name}.Blender.appdata.xml \ @@ -332,7 +332,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.%{name}.Bl %{_metainfodir}/org.%{name}.Blender.appdata.xml %files rpm-macros -%{macrosdir}/macros.%{name} +%{macrosdir}/macros.%{name}-rpm %changelog %autochangelog diff --git a/macros.blender b/macros.blender deleted file mode 100644 index 149325e..0000000 --- a/macros.blender +++ /dev/null @@ -1,7 +0,0 @@ -%blender_api @VERSION@ - -%blender_libdir %{_datadir}/blender -%blender_archdir %{_libdir}/blender -%blender_addons %{blender_libdir}/scripts/addons -%blender_modules %{blender_libdir}/scripts/modules -%blender_preset %{blender_libdir}/scripts/presets