rpms/meka/F-20 meka-0.80-format-strings.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 meka.spec, 1.7, 1.8 sources, 1.4, 1.5 meka-0.80-pointer.patch, 1.1, NONE

[Andrea Musuruane]

Author: musuruan

Update of /cvs/nonfree/rpms/meka/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4547

Modified Files:
	.cvsignore meka.spec sources 
Added Files:
	meka-0.80-format-strings.patch 
Removed Files:
	meka-0.80-pointer.patch 
Log Message:
* Sun Oct 05 2014 Andrea Musuruane <musuruan at gmail.com> - 0.80-0.7.20141005svn
- Updated to a new upstream preview of version 0.80
- Made a patch to fix format strings
- Dropped cleaning at the beginning of %install
- Spec file clean up


meka-0.80-format-strings.patch:
 inputs.c |   26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

--- NEW FILE meka-0.80-format-strings.patch ---
diff -durN meka.orig/srcs/inputs.c meka/srcs/inputs.c
--- meka.orig/srcs/inputs.c	2014-10-02 14:21:42.000000000 +0200
+++ meka/srcs/inputs.c	2014-10-05 21:19:01.924936497 +0200
@@ -248,8 +248,8 @@
 void    Inputs_Switch_Joypad()
 {
     Inputs_CFG_Peripheral_Change (PLAYER_1, INPUT_JOYPAD);
-    Msg(MSGT_USER, Msg_Get(MSG_Inputs_Joypad));
-    Msg(MSGT_USER_BOX, Msg_Get(MSG_Inputs_Play_Digital));
+    Msg(MSGT_USER, "%s", Msg_Get(MSG_Inputs_Joypad));
+    Msg(MSGT_USER_BOX, "%s", Msg_Get(MSG_Inputs_Play_Digital));
     gui_menu_uncheck_range (menus_ID.inputs, 0, 5);
     gui_menu_check (menus_ID.inputs, Inputs.Peripheral[PLAYER_1]);
 }
@@ -258,8 +258,8 @@
 void    Inputs_Switch_LightPhaser()
 {
     Inputs_CFG_Peripheral_Change (PLAYER_1, INPUT_LIGHTPHASER);
-    Msg(MSGT_USER, Msg_Get(MSG_Inputs_LightPhaser));
-    Msg(MSGT_USER_BOX, Msg_Get(MSG_Inputs_Play_Mouse));
+    Msg(MSGT_USER, "%s", Msg_Get(MSG_Inputs_LightPhaser));
+    Msg(MSGT_USER_BOX, "%s", Msg_Get(MSG_Inputs_Play_Mouse));
     gui_menu_uncheck_range (menus_ID.inputs, 0, 5);
     gui_menu_check (menus_ID.inputs, Inputs.Peripheral[PLAYER_1]);
 }
@@ -268,9 +268,9 @@
 void    Inputs_Switch_PaddleControl()
 {
     Inputs_CFG_Peripheral_Change (PLAYER_1, INPUT_PADDLECONTROL);
-    Msg(MSGT_USER, Msg_Get(MSG_Inputs_PaddleControl));
-    Msg(MSGT_USER_BOX, Msg_Get(MSG_Inputs_Play_Mouse));
-    Msg(MSGT_USER_BOX, Msg_Get(MSG_Inputs_Play_Digital_Unrecommended));
+    Msg(MSGT_USER, "%s", Msg_Get(MSG_Inputs_PaddleControl));
+    Msg(MSGT_USER_BOX, "%s", Msg_Get(MSG_Inputs_Play_Mouse));
+    Msg(MSGT_USER_BOX, "%s", Msg_Get(MSG_Inputs_Play_Digital_Unrecommended));
     gui_menu_uncheck_range (menus_ID.inputs, 0, 5);
     gui_menu_check (menus_ID.inputs, Inputs.Peripheral[PLAYER_1]);
 }
@@ -278,8 +278,8 @@
 void    Inputs_Switch_SportsPad()
 {
     Inputs_CFG_Peripheral_Change (PLAYER_1, INPUT_SPORTSPAD);
-    Msg(MSGT_USER, Msg_Get(MSG_Inputs_SportsPad));
-    Msg(MSGT_USER_BOX, Msg_Get(MSG_Inputs_Play_Mouse));
+    Msg(MSGT_USER, "%s", Msg_Get(MSG_Inputs_SportsPad));
+    Msg(MSGT_USER_BOX, "%s", Msg_Get(MSG_Inputs_Play_Mouse));
     gui_menu_uncheck_range (menus_ID.inputs, 0, 5);
     gui_menu_check (menus_ID.inputs, Inputs.Peripheral[PLAYER_1]);
 }
@@ -287,8 +287,8 @@
 void    Inputs_Switch_GraphicBoard()
 {
     Inputs_CFG_Peripheral_Change (PLAYER_1, INPUT_GRAPHICBOARD);
-    Msg(MSGT_USER, Msg_Get(MSG_Inputs_GraphicBoard));
-    Msg(MSGT_USER_BOX, Msg_Get(MSG_Inputs_Play_Pen));
+    Msg(MSGT_USER, "%s", Msg_Get(MSG_Inputs_GraphicBoard));
+    Msg(MSGT_USER_BOX, "%s", Msg_Get(MSG_Inputs_Play_Pen));
     gui_menu_uncheck_range (menus_ID.inputs, 0, 5);
     gui_menu_check (menus_ID.inputs, Inputs.Peripheral[PLAYER_1]);
 }
@@ -296,8 +296,8 @@
 void    Inputs_Switch_GraphicBoardV2()
 {
     Inputs_CFG_Peripheral_Change (PLAYER_1, INPUT_GRAPHICBOARD_V2);
-    Msg(MSGT_USER, Msg_Get(MSG_Inputs_GraphicBoardV2));
-    Msg(MSGT_USER_BOX, Msg_Get(MSG_Inputs_Play_Pen));
+    Msg(MSGT_USER, "%s", Msg_Get(MSG_Inputs_GraphicBoardV2));
+    Msg(MSGT_USER_BOX, "%s", Msg_Get(MSG_Inputs_Play_Pen));
     gui_menu_uncheck_range (menus_ID.inputs, 0, 5);
     gui_menu_check (menus_ID.inputs, Inputs.Peripheral[PLAYER_1]);
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/meka/F-20/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	23 Aug 2013 15:13:44 -0000	1.4
+++ .cvsignore	5 Oct 2014 21:12:50 -0000	1.5
@@ -1 +1 @@
-meka-2013-07-25-srcs.zip
+meka-2014-10-05-srcs.zip


Index: meka.spec
===================================================================
RCS file: /cvs/nonfree/rpms/meka/F-20/meka.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- meka.spec	1 Oct 2013 16:32:24 -0000	1.7
+++ meka.spec	5 Oct 2014 21:12:50 -0000	1.8
@@ -1,23 +1,22 @@
-%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
-%global pkgdate 2013-07-25
+%global pkgdate 2014-10-05
 
 Name: meka
 Version: 0.80
-Release: 0.5.20130725svn%{?dist}
+Release: 0.7.20141005svn%{?dist}
 Summary: Sega 8-bit machine emulator
 
 License: MEKA and non-commercial
 URL: http://www.smspower.org/meka/      
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-#  svn export -r 435 svn://svn.smspower.org/meka/trunk/meka meka-r435
-#  cd meka-r435/
-#  zip -ro ../meka-2013-07-25-srcs.zip *
+#  svn export -r 496 svn://svn.smspower.org/meka/trunk/meka meka-r496
+#  cd meka-r496/
+#  zip -ro ../meka-2014-10-05-srcs.zip *
 Source0: %{name}-%{pkgdate}-srcs.zip
 Source1: %{name}.sh
 Source2: %{name}.desktop
-# Fix pointer cast
-Patch0: %{name}-0.80-pointer.patch
+# Fix format strings
+Patch0: %{name}-0.80-format-strings.patch
 
 # This is package contains ix86 asm code
 ExclusiveArch: i686 x86_64
@@ -49,7 +48,7 @@
 And if you are, I doubt you will want to play Nintendo games. So forget it.
 
 %prep
-%setup -q -c 
+%setup -q -c
 %patch0 -p1
 
 # Remove boundled libs
@@ -64,9 +63,6 @@
   mv $i.utf8 $i
 done
 
-# Use unversioned docdir
-sed -i 's!/usr/share/doc/$GAME-$VERSION!%{_pkgdocdir}!' %{SOURCE1}
-
 # Compile for unix
 sed -i 's/SYSTEM = macosx/# SYSTEM = macosx/' srcs/Makefile
 sed -i 's/# SYSTEM = unix/SYSTEM = unix/' srcs/Makefile
@@ -80,8 +76,6 @@
 
 
 %install
-rm -rf %{buildroot}
-
 install -d %{buildroot}/%{_bindir}
 install -m 755 %{SOURCE1} %{buildroot}/%{_bindir}/meka
 install -d %{buildroot}/%{_libexecdir}/meka
@@ -134,6 +128,15 @@
 
 
 %changelog
+* Sun Oct 05 2014 Andrea Musuruane <musuruan at gmail.com> - 0.80-0.7.20141005svn
+- Updated to a new upstream preview of version 0.80
+- Made a patch to fix format strings
+- Dropped cleaning at the beginning of %%install
+- Spec file clean up
+
+* Sun Aug 31 2014 Sérgio Basto <sergio at serjux.com> - 0.80-0.6.20130725svn
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
 * Tue Oct 01 2013 Nicolas Chauvet <kwizart at gmail.com> - 0.80-0.5.20130725svn
 - Rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/meka/F-20/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	23 Aug 2013 15:13:44 -0000	1.4
+++ sources	5 Oct 2014 21:12:50 -0000	1.5
@@ -1 +1 @@
-4e9951cec65777c96c3028388ed12b9d  meka-2013-07-25-srcs.zip
+ee9171bb0d19aeb90ca14626dc436e6d  meka-2014-10-05-srcs.zip


--- meka-0.80-pointer.patch DELETED ---