[Freeciv-Dev] (PR#9977) freeciv-client-gtk: Missing GNOME menu item

["Mateusz Stefek" <mstefek@xxxxxxxxx>]

<URL: http://rt.freeciv.org/Ticket/Display.html?id=9977 >

Here's a patch.
The .desktop file is installed in prefix/share/applications iff client
is enabled.

1) Patch -p0 <desktop_1.diff
2) move freeciv.desktop.in into bootstrap directory
3) Add bootstrap/freeciv.desktop.in into EXTRA_DIST in Makefile.am
--
mateusz

Index: client/Makefile.am
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/Makefile.am,v
retrieving revision 1.60
diff -u -r1.60 Makefile.am
--- client/Makefile.am  27 Aug 2004 08:18:37 -0000      1.60
+++ client/Makefile.am  22 Sep 2004 16:39:55 -0000
@@ -202,3 +202,6 @@
 civclient_DEPENDENCIES = $(fc_civclient_libs)
 civclient_LDADD        = $(fc_civclient_libs) $(fc_civclient_libs) \
        @INTLLIBS@ @CLIENT_LIBS@ @SOUND_LIBS@
+desktopfiledir = $(prefix)/share/applications
+desktopfile_DATA = \
+       freeciv.desktop
Index: bootstrap/freeciv.spec.in
===================================================================
RCS file: /home/freeciv/CVS/freeciv/bootstrap/freeciv.spec.in,v
retrieving revision 1.1
diff -u -r1.1 freeciv.spec.in
--- bootstrap/freeciv.spec.in   21 Sep 2004 00:58:58 -0000      1.1
+++ bootstrap/freeciv.spec.in   22 Sep 2004 16:39:55 -0000
@@ -181,6 +181,7 @@
                     datadir=$RPM_BUILD_ROOT%{_gamesdatadir} \
                     localedir=$RPM_BUILD_ROOT%{_datadir}/locale \
                     mandir=$RPM_BUILD_ROOT%{_mandir} \
+                    prefix=$RPM_BUILD_ROOT/usr \
                     -C build-$client
        %__mv $RPM_BUILD_ROOT%{_gamesbindir}/civclient \
                $RPM_BUILD_ROOT%{_gamesbindir}/civclient-$client
@@ -191,6 +192,7 @@
                     datadir=$RPM_BUILD_ROOT%{_gamesdatadir} \
                     localedir=$RPM_BUILD_ROOT%{_datadir}/locale \
                     mandir=$RPM_BUILD_ROOT%{_mandir} \
+                    prefix=$RPM_BUILD_ROOT/usr \
                     -C build-server
 %find_lang %{name}
 
@@ -282,6 +284,7 @@
 %{_gamesdatadir}/%{name}/helpdata.txt
 %{_gamesdatadir}/%{name}/*.tilespec
 %{_mandir}/man6/civclient.6
+/usr/share/applications/freeciv.desktop
 %defattr(755, root, games, 0755)
 
 %if_with gtk2
Index: configure.ac
===================================================================
RCS file: /home/freeciv/CVS/freeciv/configure.ac,v
retrieving revision 1.76
diff -u -r1.76 configure.ac
--- configure.ac        21 Sep 2004 00:58:58 -0000      1.76
+++ configure.ac        22 Sep 2004 16:40:10 -0000
@@ -405,6 +405,7 @@
 
   gui_sources="gui-$client"
 fi
+
 AC_SUBST(gui_sources)
 AC_SUBST(CLIENT_CFLAGS)
 AC_SUBST(CLIENT_LIBS)
@@ -667,7 +668,8 @@
          doc/nl/Makefile
          doc/sv/Makefile
          freeciv.spec:bootstrap/freeciv.spec.in
-         bootstrap/undep.sh])
+         bootstrap/undep.sh
+         client/freeciv.desktop:bootstrap/freeciv.desktop.in])
 AC_CONFIG_FILES([civ:bootstrap/civ.in], [chmod +x civ])
 AC_CONFIG_FILES([ser:bootstrap/ser.in], [chmod +x ser])
 AC_CONFIG_COMMANDS([default],[[ chmod +x bootstrap/undep.sh ; 
bootstrap/undep.sh ]],[[]])
Index: configure.in
===================================================================
RCS file: /home/freeciv/CVS/freeciv/configure.in,v
retrieving revision 1.253
diff -u -r1.253 configure.in
--- configure.in        21 Sep 2004 00:58:58 -0000      1.253
+++ configure.in        22 Sep 2004 16:40:10 -0000
@@ -664,5 +664,6 @@
          civ:bootstrap/civ.in
          ser:bootstrap/ser.in
          freeciv.spec:bootstrap/freeciv.spec.in
-         bootstrap/undep.sh,
+         bootstrap/undep.sh
+         client/freeciv.desktop:bootstrap/freeciv.desktop.in,
          [ chmod +x bootstrap/undep.sh civ ser ; bootstrap/undep.sh ])

freeciv.desktop.in
Description: Binary data