From 05483394db075f3664c124fcdb3729d0367ed963 Mon Sep 17 00:00:00 2001 From: Ville Skyttä Date: Dec 11 2004 15:54:10 +0000 Subject: Fix FC3 build, improve desktop entry comment. --- diff --git a/uqm-gcc34MM.patch b/uqm-gcc34MM.patch new file mode 100644 index 0000000..e177453 --- /dev/null +++ b/uqm-gcc34MM.patch @@ -0,0 +1,14 @@ +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. diff --git a/uqm.desktop b/uqm.desktop index 6d354a7..d981635 100644 --- a/uqm.desktop +++ b/uqm.desktop @@ -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 diff --git a/uqm.spec b/uqm.spec index 1c9853f..58dc7aa 100644 --- a/uqm.spec +++ b/uqm.spec @@ -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 @@ Source1: %{name}.conf 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 @@ version of Star Control II, with their permission and encouragement. %patch0 -p0 %patch1 -p0 %patch2 -p0 +%patch3 %build @@ -86,6 +88,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Dec 11 2004 Ville Skyttä - 0:0.3-3 +- Fix build on FC3. +- Improve comment in desktop entry file, add Finnish translation. + * Thu Jun 17 2004 Ville Skyttä - 0:0.3-0.fdr.2 - Add upstream patch to fix all blue comms screen (bug 1751, upstream bug 363).