From 366aa11cfd8ca4ce021dcdd74782fe70ce47eafc Mon Sep 17 00:00:00 2001 From: Björn Esser Date: Jan 31 2019 19:57:39 +0000 Subject: Remove el5 cruft from spec file --- diff --git a/dreamweb.spec b/dreamweb.spec index b7cbf6e..8a3477d 100644 --- a/dreamweb.spec +++ b/dreamweb.spec @@ -52,7 +52,6 @@ Name: dreamweb Version: 1.1 Release: 8%{?dist} Summary: Click-and-point adventure with the look and feel of Ridley Scott's Blade Runner -%{?el5:Group: Amusements/Games} # The license-file included in the sources says: # @@ -111,7 +110,6 @@ Source90: %{src_url}manuals-en-highres.zip Source91: %{src_url}manuals-en-lores.zip BuildArch: noarch -%{?el5:BuildRoot: %(/bin/mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)} BuildRequires: desktop-file-utils dos2unix fdupes vorbis-tools @@ -121,7 +119,6 @@ BuildRequires: desktop-file-utils dos2unix fdupes vorbis-tools %package common Summary: Common files used by %{name} -%{?el5:Group: Amusements/Games} # The files inside this sub-pkg are pretty useless without the files # shipped with the other packages. @@ -137,7 +134,6 @@ This package contains common files used by %{name}. %package doc Summary: Documentation files for %{name} -%{?el5:Group: Documentation} %description doc This package contains documentation files used by %{name}. The @@ -151,7 +147,6 @@ versions of the game from those documents. %package us Summary: US-English language version of %{name} -%{?el5:Group: Amusements/Games} Requires: %{name}-common == %{version}-%{release} @@ -169,7 +164,6 @@ Blade Runner. %package uk Summary: UK-English language version of %{name} -%{?el5:Group: Amusements/Games} Requires: %{name}-common == %{version}-%{release} @@ -187,7 +181,6 @@ Blade Runner. %package fr Summary: French language version of %{name} -%{?el5:Group: Amusements/Games} Requires: %{name}-common == %{version}-%{release} @@ -205,7 +198,6 @@ Blade Runner. %package de Summary: German language version of %{name} -%{?el5:Group: Amusements/Games} Requires: %{name}-common == %{version}-%{release} @@ -223,7 +215,6 @@ Blade Runner. %package it Summary: Italian language version of %{name} -%{?el5:Group: Amusements/Games} Requires: %{name}-common == %{version}-%{release} @@ -241,7 +232,6 @@ Blade Runner. %package es Summary: Spanish language version of %{name} -%{?el5:Group: Amusements/Games} Requires: %{name}-common == %{version}-%{release} @@ -364,8 +354,6 @@ popd %install -%{?el5:%{__rm} -rf %{buildroot}} - # Install the game-files. %{__mkdir} -p %{buildroot}%{_datadir}/applications \ %{buildroot}%{?destdir} %{buildroot}%{?_pkgdocdir} @@ -377,19 +365,15 @@ popd %{__rm} -f %{buildroot}%{?_pkgdocdir}/license.txt %endif # 0%%{?with_license} != 0 -# Install the desktop-files. Vendor-tag is mandatory on el5. +# Install the desktop-files. for _lang in %{?avail_langs} do - %{_bindir}/desktop-file-install %{?el5:--vendor="ScummVM"} \ - --dir=%{buildroot}%{_datadir}/applications \ + %{_bindir}/desktop-file-install \ + --dir=%{buildroot}%{_datadir}/applications \ %{name}-${_lang}.desktop done -%{?el5:%clean} -%{?el5:%{__rm} -rf %{buildroot}} - - %files common %dir %{?destdir} %doc %dir %{?_pkgdocdir} @@ -409,32 +393,32 @@ done %files us %doc %{?_pkgdocdir}/us -%{_datadir}/applications/%{?el5:ScummVM-}%{name}-us.desktop +%{_datadir}/applications/%{name}-us.desktop %{?destdir}/us %files uk %doc %{?_pkgdocdir}/uk -%{_datadir}/applications/%{?el5:ScummVM-}%{name}-uk.desktop +%{_datadir}/applications/%{name}-uk.desktop %{?destdir}/uk %files fr %doc %{?_pkgdocdir}/fr -%{_datadir}/applications/%{?el5:ScummVM-}%{name}-fr.desktop +%{_datadir}/applications/%{name}-fr.desktop %{?destdir}/fr %files de %doc %{?_pkgdocdir}/de -%{_datadir}/applications/%{?el5:ScummVM-}%{name}-de.desktop +%{_datadir}/applications/%{name}-de.desktop %{?destdir}/de %files it %doc %{?_pkgdocdir}/it -%{_datadir}/applications/%{?el5:ScummVM-}%{name}-it.desktop +%{_datadir}/applications/%{name}-it.desktop %{?destdir}/it %files es %doc %{?_pkgdocdir}/es -%{_datadir}/applications/%{?el5:ScummVM-}%{name}-es.desktop +%{_datadir}/applications/%{name}-es.desktop %{?destdir}/es