- rel. 4: more fixes in -desktop patch

[packages/gbatnav.git] / gbatnav.spec

diff --git a/gbatnav.spec b/gbatnav.spec
index 74c7cb7c530d506daf4919be1439b7014a6bc1e0..dc8c55cf2c5ce230fc3a4121f5657c219e2005ff 100644 (file)
--- a/gbatnav.spec
+++ b/gbatnav.spec
@@ -2,11 +2,13 @@ Summary:      Batalla Naval is a networked multiplayer battleship game
 Summary(pl):   Batalla Naval - sieciowa gra wojenna dla wielu graczy
 Name:          gbatnav
 Version:       1.0.4
-Release:       1
+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}-desktop.patch
 URL:           http://batnav.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -17,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.
@@ -28,12 +29,13 @@ Batalla Naval to sieciowa gra wojenna.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 rm -f missing
 %{__libtoolize}
 %{__gettextize}
-aclocal -I macros
+%{__aclocal} -I macros
 %{__autoconf}
 %{__automake}
 %configure
@@ -44,7 +46,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
-       Gamesdir=%{_applnkdir}/Games
+       Gamesdir=%{_desktopdir}
 
 %find_lang %{name} --with-gnome
 
@@ -56,4 +58,4 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS README README.IPv6 NEWS TODO ChangeLog
 %attr(755,root,root) %{_bindir}/*
 %{_pixmapsdir}/*
-%{_applnkdir}/Games/*
+%{_desktopdir}/*