From 2f23a7bd7624c01dcca40e5ef33f0aefaf609b8f8d9a284853665066b5328f18 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Mon, 5 Jan 2015 14:29:41 +0000
Subject: [PATCH] spec-cleanup

OBS-URL: https://build.opensuse.org/package/show/games/freeciv?expand=0&rev=28
---
 freeciv.spec | 50 +++++++++++++++++++++++++-------------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/freeciv.spec b/freeciv.spec
index 000f68a..4c84d1f 100644
--- a/freeciv.spec
+++ b/freeciv.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package freeciv
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,6 +17,18 @@
 
 
 Name:           freeciv
+Version:        2.4.4
+Release:        0
+Summary:        Free Civilization Clone
+License:        GPL-2.0+
+Group:          Amusements/Games/Strategy/Turn Based
+Url:            http://www.freeciv.org
+Source0:        http://download.gna.org/freeciv/stable/%{name}-%{version}.tar.bz2
+Source1:        freeciv.desktop
+Source2:        freeciv.png
+Source3:        freeciv-manual
+Source4:        freeciv-manual.desktop
+Source5:        freeciv-manual.png
 BuildRequires:  SDL_mixer-devel
 BuildRequires:  audiofile-devel
 BuildRequires:  autoconf
@@ -31,18 +43,6 @@ BuildRequires:  libtool
 BuildRequires:  readline-devel
 BuildRequires:  update-desktop-files
 BuildRequires:  xz-devel
-Url:            http://www.freeciv.org
-Summary:        Free Civilization Clone
-License:        GPL-2.0+
-Group:          Amusements/Games/Strategy/Turn Based
-Version:        2.4.4
-Release:        0
-Source0:        http://download.gna.org/freeciv/stable/%{name}-%{version}.tar.bz2
-Source1:        freeciv.desktop
-Source2:        freeciv.png
-Source3:        freeciv-manual
-Source4:        freeciv-manual.desktop
-Source5:        freeciv-manual.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -70,20 +70,20 @@ autoreconf -fi
 make %{?_smp_mflags}
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
-install -m 755 $RPM_SOURCE_DIR/freeciv-manual $RPM_BUILD_ROOT/usr/bin
-mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/
-install -m 644 $RPM_SOURCE_DIR/*.png $RPM_BUILD_ROOT/usr/share/pixmaps
-%suse_update_desktop_file -i %name Game StrategyGame
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
+install -m 755 $RPM_SOURCE_DIR/freeciv-manual %{buildroot}%{_prefix}/bin
+mkdir -p %{buildroot}%{_datadir}/pixmaps/
+install -m 644 $RPM_SOURCE_DIR/*.png %{buildroot}%{_datadir}/pixmaps
+%suse_update_desktop_file -i %{name} Game StrategyGame
 %suse_update_desktop_file -i freeciv-manual Game StrategyGame
 %if 0%{?sles_version} == 11
-%__rm -rf %{buildroot}/%{_datadir}/locale/no
+rm -rf %{buildroot}/%{_datadir}/locale/no
 %endif
 
-%find_lang %name
-%fdupes %{buildroot}/%{_datadir}/ 
+%find_lang %{name}
+%fdupes %{buildroot}/%{_datadir}/
 
-%files -f %name.lang
+%files -f %{name}.lang
 %defattr(-,root,root)
 %doc %{_docdir}/freeciv
 %exclude %{_docdir}/freeciv/INSTALL*
@@ -99,7 +99,7 @@ install -m 644 $RPM_SOURCE_DIR/*.png $RPM_BUILD_ROOT/usr/share/pixmaps
 %{_datadir}/applications/freeciv-manual.desktop
 %{_datadir}/applications/freeciv-server.desktop
 %{_datadir}/applications/freeciv-modpack.desktop
-%{_datadir}/applications/%name.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/freeciv/
 %{_datadir}/icons/hicolor/128x128/apps/freeciv-client.png
 %{_datadir}/icons/hicolor/128x128/apps/freeciv-server.png
@@ -118,8 +118,8 @@ install -m 644 $RPM_SOURCE_DIR/*.png $RPM_BUILD_ROOT/usr/share/pixmaps
 %{_datadir}/icons/hicolor/64x64/apps/freeciv-modpack.png
 %{_datadir}/pixmaps/freeciv-client.png
 %{_datadir}/pixmaps/freeciv-manual.png
-%{_datadir}/pixmaps/%name.png
+%{_datadir}/pixmaps/%{name}.png
 %dir %{_datadir}/appdata
-%{_datadir}/appdata/%name-*.appdata.xml
+%{_datadir}/appdata/%{name}-*.appdata.xml
 
 %changelog