diff --git a/boswars.spec b/boswars.spec index 6a1d398..39df8af 100644 --- a/boswars.spec +++ b/boswars.spec @@ -1,6 +1,6 @@ Name: boswars Version: 2.6.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Bos Wars is a futuristic real-time strategy game Group: Amusements/Games License: GPLv2 @@ -8,10 +8,9 @@ URL: http://www.boswars.org/ Source0: http://www.boswars.org/dist/releases/%{name}-%{version}-src.tar.gz Source1: %{name}.desktop Patch0: boswars-2.4.1-SConstruct.patch -# incomplete patch to port boswars to the sysytem guichan-0.6 instead of +# incomplete patch to port boswars to the system guichan-0.6 instead of # using the included guichan-0.4. Incomplete, NOT finished and NOT working! -Patch1: boswars-2.4.1-guichan26.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +#Patch1: boswars-2.4.1-guichan26.patch BuildRequires: libtheora-devel libvorbis-devel lua-devel SDL-devel libGL-devel BuildRequires: tolua++-devel libpng-devel scons desktop-file-utils Requires: hicolor-icon-theme xorg-x11-utils @@ -30,13 +29,10 @@ chmod -x engine/guichan/include/guichan/sdl/sdlgraphics.h \ # we want to use the system version of these rm engine/tolua/*.h engine/tolua/tolua_*.cpp - %build scons %{?_smp_mflags} opengl=1 CC="gcc $RPM_OPT_FLAGS" CXX="g++ $RPM_OPT_FLAGS" - %install -rm -fr $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/languages install -m 755 %{name} $RPM_BUILD_ROOT%{_bindir} @@ -45,21 +41,12 @@ install -p -m 644 languages/*.po languages/*.pot \ cp -a campaigns graphics intro maps scripts sounds units patches \ $RPM_BUILD_ROOT%{_datadir}/%{name} - -# below is the desktop file and icon stuff. mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -desktop-file-install --vendor fedora \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - %{SOURCE1} +desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1} mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps install -p -m 644 graphics/ui/elites_claw.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png - -%clean -rm -rf $RPM_BUILD_ROOT - - %post touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : @@ -72,17 +59,18 @@ fi %posttrans gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - %files -%defattr(-,root,root,-) %doc *.txt CHANGELOG doc/*.html doc/guichan-copyright.txt %{_bindir}/%{name} %{_datadir}/%{name} -%{_datadir}/applications/fedora-%{name}.desktop +%{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/32x32/apps/%{name}.png - %changelog +* Thu Feb 14 2013 Rahul Sundaram - 2.6.1-8 +- remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247 +- clean up spec to follow current guidelines + * Wed Feb 13 2013 Fedora Release Engineering - 2.6.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild