rpms/rocksndiamonds/devel rocksndiamonds.spec,1.3,1.4

Tom Callaway (spot) fedora-extras-commits at redhat.com
Tue Nov 21 15:32:16 UTC 2006


Author: spot

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

Modified Files:
	rocksndiamonds.spec 
Log Message:

Patch up to fix bz 210767



Index: rocksndiamonds.spec
===================================================================
RCS file: /cvs/extras/rpms/rocksndiamonds/devel/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:46 -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
 




More information about the scm-commits mailing list