rpms/rocksndiamonds/FC-6 rocksndiamonds-YN.patch, NONE, 1.1 rocksndiamonds-highscore.patch, NONE, 1.1 rocksndiamonds.spec, 1.3, 1.4

[Tom Callaway (spot)]

Author: spot

Update of /cvs/extras/rpms/rocksndiamonds/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17227/FC-6

Modified Files:
	rocksndiamonds.spec 
Added Files:
	rocksndiamonds-YN.patch rocksndiamonds-highscore.patch 
Log Message:

Patch up to fix bz 210767


rocksndiamonds-YN.patch:

--- NEW FILE rocksndiamonds-YN.patch ---
--- rocksndiamonds-3.2.2/src/tools.c.yesno	2006-08-29 19:50:13.000000000 +0200
+++ rocksndiamonds-3.2.2/src/tools.c	2006-10-14 14:33:15.000000000 +0200
@@ -2513,6 +2513,18 @@
 	    case KSYM_Escape:
 	      result = 0;
 	      break;
+            
+            case KSYM_y:
+            case KSYM_Y:
+              if (req_state & REQ_ASK)
+                result = TRUE;
+              break;
+
+            case KSYM_n:
+            case KSYM_N:
+              if (req_state & REQ_ASK)
+                result = FALSE;
+              break;
 
 	    default:
 	      break;

rocksndiamonds-highscore.patch:

--- NEW FILE rocksndiamonds-highscore.patch ---
--- rocksndiamonds-3.2.2/src/libgame/setup.c.hs	2006-08-20 14:05:41.000000000 +0200
+++ rocksndiamonds-3.2.2/src/libgame/setup.c	2006-10-14 14:56:13.000000000 +0200
@@ -126,7 +126,11 @@
 static char *getScoreDir(char *level_subdir)
 {
   static char *score_dir = NULL;
+#ifdef USE_USERDATADIR_FOR_COMMONDATA
+  char *data_dir = getUserGameDataDir();
+#else
   char *data_dir = getCommonDataDir();
+#endif
   char *score_subdir = SCORES_DIRECTORY;
 
   checked_free(score_dir);
@@ -781,7 +785,11 @@
 
 void InitScoreDirectory(char *level_subdir)
 {
+#ifdef USE_USERDATADIR_FOR_COMMONDATA
+  createDirectory(getUserGameDataDir(), "user data", PERMS_PRIVATE);
+#else
   createDirectory(getCommonDataDir(), "common data", PERMS_PUBLIC);
+#endif
   createDirectory(getScoreDir(NULL), "main score", PERMS_PUBLIC);
   createDirectory(getScoreDir(level_subdir), "level score", PERMS_PUBLIC);
 }


Index: rocksndiamonds.spec
===================================================================
RCS file: /cvs/extras/rpms/rocksndiamonds/FC-6/rocksndiamonds.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rocksndiamonds.spec	15 Sep 2006 17:43:58 -0000	1.3
+++ rocksndiamonds.spec	21 Nov 2006 15:31:45 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		rocksndiamonds
 Version:	3.2.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		Amusements/Games
 Summary:	Underground digging game
@@ -9,6 +9,8 @@
 Source1:	rocksndiamonds.desktop
 Source2:	rocksndiamonds.png
 Patch0:		rocksndiamonds-3.1.1-nosmpeg.patch
+Patch1:		rocksndiamonds-highscore.patch
+Patch2:		rocksndiamonds-YN.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	SDL-devel, libX11-devel, desktop-file-utils, xorg-x11-proto-devel
 BuildRequires:	SDL_image-devel, SDL_mixer-devel, SDL_net-devel
@@ -20,9 +22,11 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
-make %{?_smp_mflags} RO_GAME_DIR=%{_datadir}/%{name}/ RW_GAME_DIR=%{_localstatedir}/games/%{name}/ EXTRA_CFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags} RO_GAME_DIR=%{_datadir}/%{name}/ RW_GAME_DIR=%{_localstatedir}/games/%{name}/ EXTRA_CFLAGS="$RPM_OPT_FLAGS -DUSE_USERDATADIR_FOR_COMMONDATA"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -61,6 +65,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Nov 21 2006 Tom "spot" Callaway <tcallawa at redhat.com> 3.2.2-2
+- add patches from bz 210767
+
 * Fri Sep 15 2006 Tom "spot" Callaway <tcallawa at redhat.com> 3.2.2-1
 - bump to 3.2.2