- rel. 4: more fixes in -desktop patch

[packages/gbatnav.git] / gbatnav.spec

diff --git a/gbatnav.spec b/gbatnav.spec
index 78224d5b584c125c2a2e6d3fb77ce11a393157c3..dc8c55cf2c5ce230fc3a4121f5657c219e2005ff 100644 (file)
--- a/gbatnav.spec
+++ b/gbatnav.spec
@@ -1,13 +1,14 @@
 Summary:       Batalla Naval is a networked multiplayer battleship game
 Summary(pl):   Batalla Naval - sieciowa gra wojenna dla wielu graczy
 Name:          gbatnav
-Version:       1.0.2
-Release:       3
+Version:       1.0.4
+Release:       4
 License:       GPL
 Group:         X11/Applications/Games
-Source0:       http://download.sourceforge.net/batnav/%{name}-%{version}.tar.gz
+Source0:       http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+# Source0-md5: 9975f2d4d0c481fd97a910958007b42d
 Patch0:                %{name}-DESTDIR.patch
-Patch1:                %{name}-am_fixes.patch
+Patch1:                %{name}-desktop.patch
 URL:           http://batnav.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -18,7 +19,6 @@ BuildRequires:        gnome-libs-devel
 BuildRequires: libtool
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _prefix         /usr/X11R6
 
 %description
 Batalla Naval is a networked naval battleship game.
@@ -32,16 +32,12 @@ Batalla Naval to sieciowa gra wojenna.
 %patch1 -p1
 
 %build
-cd ggz
-       aclocal
-       autoconf
-cd ..
 rm -f missing
-libtoolize --copy --force
-gettextize --copy --force
-aclocal -I macros
-autoconf
-automake -a -c -f
+%{__libtoolize}
+%{__gettextize}
+%{__aclocal} -I macros
+%{__autoconf}
+%{__automake}
 %configure
 %{__make}
 
@@ -50,9 +46,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
-       Gamesdir=%{_applnkdir}/Games
-
-gzip -9nf AUTHORS README README.IPv6 NEWS TODO ChangeLog
+       Gamesdir=%{_desktopdir}
 
 %find_lang %{name} --with-gnome
 
@@ -61,7 +55,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc *.gz
+%doc AUTHORS README README.IPv6 NEWS TODO ChangeLog
 %attr(755,root,root) %{_bindir}/*
 %{_pixmapsdir}/*
-%{_applnkdir}/Games/*
+%{_desktopdir}/*