rpms/uqm/devel uqm-gcc34MM.patch, NONE, 1.1 uqm.desktop, 1.1, 1.2 uqm.spec, 1.3, 1.4

[Ville Skytta (scop)]

Changeset from: scop

Update of /cvs/extras/rpms/uqm/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv18177

Modified Files:
	uqm.desktop uqm.spec 
Added Files:
	uqm-gcc34MM.patch 
Log Message:
Fix FC3 build, improve desktop entry comment.

uqm-gcc34MM.patch:

--- NEW FILE uqm-gcc34MM.patch ---
Without this kludge, the uqm build system with gcc >= 3.4 (-MM) creates a
broken dependency file.  gcc 3.3.4 seems to be fine.

--- build/unix/build_functions~	2003-09-06 18:14:19.000000000 +0300
+++ build/unix/build_functions	2004-12-11 16:43:36.258038290 +0200
@@ -88,7 +88,7 @@
 		done
 		echo
 		build_do_recursive build_dependancies :
-	} > "$DEPEND_FILE"
+	} | perl -pe 's/# 1 .*\n//' > "$DEPEND_FILE"
 }
 
 # Output the .o file for a .c file.


Index: uqm.desktop
===================================================================
RCS file: /cvs/extras/rpms/uqm/devel/uqm.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- uqm.desktop	8 Nov 2004 05:30:18 -0000	1.1
+++ uqm.desktop	11 Dec 2004 15:54:10 -0000	1.2
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=The Ur-Quan Masters
-Comment=The Ur-Quan Masters
+Comment=An epic space adventure
+Comment[fi]=Eeppinen avaruusseikkailu
 Exec=uqm
 Icon=uqm.png
 Terminal=false


Index: uqm.spec
===================================================================
RCS file: /cvs/extras/rpms/uqm/devel/uqm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- uqm.spec	8 Nov 2004 05:30:30 -0000	1.3
+++ uqm.spec	11 Dec 2004 15:54:10 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           uqm
 Version:        0.3
-Release:        0.fdr.2.2
+Release:        3
 Epoch:          0
 Summary:        The Ur-Quan Masters
 
@@ -12,8 +12,9 @@
 Source2:        %{name}.desktop
 Patch0:         %{name}-config.patch
 Patch1:         %{name}-optflags.patch
-# http://uqm.stack.nl/cgi-bin/bugs/show_bug.cgi?id=363#c20
+# Patch2: http://uqm.stack.nl/cgi-bin/bugs/show_bug.cgi?id=363#c20
 Patch2:         %{name}-comms-bluescreen.patch
+Patch3:         %{name}-gcc34MM.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel >= 0:1.2.3, SDL_image-devel, SDL_mixer-devel
@@ -33,6 +34,7 @@
 %patch0 -p0
 %patch1 -p0
 %patch2 -p0
+%patch3
 
 
 %build
@@ -86,6 +88,10 @@
 
 
 %changelog
+* Sat Dec 11 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.3-3
+- Fix build on FC3.
+- Improve comment in desktop entry file, add Finnish translation.
+
 * Thu Jun 17 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.3-0.fdr.2
 - Add upstream patch to fix all blue comms screen (bug 1751, upstream bug 363).