[packages/dopewars] - rel 8; build fixed

arekm arekm at pld-linux.org
Sat Dec 12 13:29:27 CET 2015


commit a5adf4812785a5e4ca5bb724b7af0a053804f170
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat Dec 12 13:29:22 2015 +0100

    - rel 8; build fixed

 dopewars-build.patch | 22 ++++++++++++++++++++++
 dopewars.spec        |  5 ++++-
 2 files changed, 26 insertions(+), 1 deletion(-)
---
diff --git a/dopewars.spec b/dopewars.spec
index fde970e..d2ce3e8 100644
--- a/dopewars.spec
+++ b/dopewars.spec
@@ -9,13 +9,14 @@ Summary:	Drug dealing game
 Summary(pl.UTF-8):	Gra polegająca na handlowaniu narkotykami
 Name:		dopewars
 Version:	1.5.12
-Release:	7
+Release:	8
 License:	GPL
 Group:		Applications/Games
 Source0:	http://downloads.sourceforge.net/dopewars/%{name}-%{version}.tar.gz
 # Source0-md5:	debf749de9053dc2fb2e74c37ae06206
 Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-scoredir.patch
+Patch2:		%{name}-build.patch
 URL:		http://dopewars.sourceforge.net/
 %{?with_sdl:BuildRequires:	SDL-devel >= 1.0.0}
 %{?with_sdl:BuildRequires:	SDL_mixer-devel}
@@ -61,6 +62,7 @@ poleceń (pokaże je dopewars -h).
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 rm -f missing
@@ -92,6 +94,7 @@ install -d $RPM_BUILD_ROOT%{_desktopdir}
 mv $RPM_BUILD_ROOT%{_datadir}/gnome/apps/Games/dopewars.desktop $RPM_BUILD_ROOT%{_desktopdir}
 
 rm -f doc/help/Makefile*
+rm -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
 # es_ES.po seems to be newer than es.po
 mv -f $RPM_BUILD_ROOT%{_datadir}/locale/es_ES/LC_MESSAGES/* \
diff --git a/dopewars-build.patch b/dopewars-build.patch
new file mode 100644
index 0000000..7234ce7
--- /dev/null
+++ b/dopewars-build.patch
@@ -0,0 +1,22 @@
+--- dopewars-1.5.12/src/gtkport/gtkport.c~	2005-12-30 03:37:32.000000000 +0100
++++ dopewars-1.5.12/src/gtkport/gtkport.c	2015-12-12 13:25:24.452515928 +0100
+@@ -5636,7 +5636,7 @@ gint GtkMessageBox(GtkWidget *parent, co
+ 
+   dialog = gtk_message_dialog_new(GTK_WINDOW(parent),
+                                   GTK_DIALOG_MODAL,
+-                                  type, buttons, Text);
++                                  type, buttons, "%s", Text);
+   if (Title) gtk_window_set_title(GTK_WINDOW(dialog), Title);
+ 
+   retval = gtk_dialog_run(GTK_DIALOG(dialog));
+--- dopewars-1.5.12/src/sound.c~	2005-12-30 03:37:32.000000000 +0100
++++ dopewars-1.5.12/src/sound.c	2015-12-12 13:27:06.155164134 +0100
+@@ -190,7 +190,7 @@ void SoundOpen(gchar *drivername)
+       err = g_strdup_printf(_("Invalid plugin \"%s\" selected.\n"
+                               "(%s available; now using \"%s\".)"),
+                             drivername, plugins, NOPLUGIN);
+-      g_log(NULL, G_LOG_LEVEL_CRITICAL, err);
++      g_log(NULL, G_LOG_LEVEL_CRITICAL, "%s", err);
+       g_free(plugins);
+       g_free(err);
+     }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/dopewars.git/commitdiff/a5adf4812785a5e4ca5bb724b7af0a053804f170



More information about the pld-cvs-commit mailing list