From 6a0ecd753b4c073d0aa797a9c5415e8a386059c4 Mon Sep 17 00:00:00 2001
From: Simone Caronni <negativo17@gmail.com>
Date: Apr 04 2020 08:49:01 +0000
Subject: Remove never finished RHEL 7 support, move desktop file validation in the check section


---

diff --git a/blender.spec b/blender.spec
index ba9454c..8eaa555 100644
--- a/blender.spec
+++ b/blender.spec
@@ -119,13 +119,9 @@ BuildRequires:  pkgconfig(opus)
 BuildRequires:  fontpackages-devel
 BuildRequires:  pkgconfig(freetype2)
 
-%if 0%{?fedora} || 0%{?rhel} >= 8
-
 # Appstream stuff
 BuildRequires:  libappstream-glib
 
-%endif
-
 Requires:       google-droid-sans-fonts
 Requires:       hicolor-icon-theme
 Requires:       %{name}-fonts = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -145,14 +141,6 @@ animation, rendering and post-production to interactive creation and playback.
 Professionals and novices can easily and inexpensively publish stand-alone,
 secure, multi-platform content to the web, CD-ROMs, and other media.
 
-#%%package -n blenderplayer
-#Summary:        Standalone Blender player
-#Provides:       %%{name}(ABI) = %%{blender_api}
-
-#%%description -n blenderplayer
-#This package contains a stand alone release of the Blender player. You will need
-#this package to play games which are based on the Blender Game Engine.
-
 %package rpm-macros
 Summary:        RPM macros to build third-party blender addons packages
 BuildArch:      noarch
@@ -220,9 +208,6 @@ install -p -D -m 644 %{SOURCE1} %{buildroot}%{_datadir}/thumbnailers/%{name}.thu
 # Mime support
 install -p -D -m 644 %{SOURCE5} %{buildroot}%{_datadir}/mime/packages/%{name}.xml
 
-# Desktop icon
-desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
-
 # Deal with docs in the files section
 rm -rf %{buildroot}%{_docdir}/%{name}/*
 
@@ -230,20 +215,11 @@ rm -rf %{buildroot}%{_docdir}/%{name}/*
 mkdir -p %{buildroot}%{macrosdir}
 sed -e 's/@VERSION@/%{blender_api}/g' %{SOURCE10} > %{buildroot}%{macrosdir}/macros.%{name}
 
-%if 0%{?fedora} || 0%{?rhel} >= 8
-
 # AppData
-mkdir - %{buildroot}%{_metainfodir}
-
 install -p -m 644 -D release/freedesktop/org.%{name}.Blender.appdata.xml \
           %{buildroot}%{_metainfodir}/%{name}.appdata.xml
 install -p -m 644 -D %{SOURCE2} %{buildroot}%{_metainfodir}/%{name}-fonts.metainfo.xml
 
-
-
-
-%endif
-
 # Localization
 %find_lang %{name}
 
@@ -254,35 +230,11 @@ rm -fr %{buildroot}%{_datadir}/%{blender_api}/locale/languages
 find %{buildroot}%{_datadir}/%{name}/%{blender_api}/scripts -name "*.py" -exec chmod 755 {} \;
 #find %%{buildroot}%%{_datadir}/%%{name}/scripts -type f -exec sed -i -e 's/\r$//g' {} \;
 
-%if 0%{?fedora} || 0%{?rhel} >= 8
-
 %check
+desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdata.xml
 appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}-fonts.metainfo.xml
 
-%endif
-
-%if 0%{?rhel} == 7
-
-%post
-/usr/bin/update-desktop-database &> /dev/null || :
-/bin/touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
-/bin/touch --no-create %{_datadir}/mime/packages &> /dev/null || :
-
-%postun
-/usr/bin/update-desktop-database &> /dev/null || :
-if [ $1 -eq 0 ] ; then
-    /bin/touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
-    /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
-    /usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
-fi
-
-%posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
-
-%endif
-
 %files -f %{name}.lang
 %license COPYING
 %license doc/license/*-license.txt
@@ -296,16 +248,7 @@ fi
 %{_datadir}/mime/packages/%{name}.xml
 %{_datadir}/thumbnailers/%{name}.thumbnailer
 %{_mandir}/man1/%{name}.*
-%if 0%{?fedora} || 0%{?rhel} >= 8
 %{_metainfodir}/%{name}.appdata.xml
-%endif
-
-#%%files -n %%{name}player
-#%%license COPYING
-#%%license doc/license/*-license.txt
-#%%license release/text/copyright.txt
-#%%{_bindir}/%%{name}player
-#%%{_mandir}/man1/%%{name}player.*
 
 %files rpm-macros
 %{macrosdir}/macros.%{name}
@@ -313,9 +256,7 @@ fi
 %files fonts
 %license release/datafiles/LICENSE-*.ttf.txt
 %{_fontbasedir}/%{name}/
-%if 0%{?fedora} || 0%{?rhel} >= 8
 %{_metainfodir}/%{name}-fonts.metainfo.xml
-%endif
 
 %changelog
 * Sat Mar 14 2020 Luya Tshimbalanga <luya@fedoraproject.org> - 1:2.82a-1