rpms/rafkill/devel rafkill-1.2.2-menu.patch, NONE, 1.1 rafkill-1.2.2-spell.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 rafkill.spec, 1.2, 1.3 sources, 1.2, 1.3 rafkill-1.2.1-debian.patch, 1.1, NONE rafkill-1.2.1-options.patch, 1.1, NONE

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	.cvsignore rafkill.spec sources 
Added Files:
	rafkill-1.2.2-menu.patch rafkill-1.2.2-spell.patch 
Removed Files:
	rafkill-1.2.1-debian.patch rafkill-1.2.1-options.patch 
Log Message:
* Thu Aug 24 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.2-1
- New upstream release 1.2.2


rafkill-1.2.2-menu.patch:

--- NEW FILE rafkill-1.2.2-menu.patch ---
--- rafkill-1.2.2/src/raptor.cpp.menu	2006-08-22 04:28:18.000000000 +0200
+++ rafkill-1.2.2/src/raptor.cpp	2006-08-24 22:11:24.000000000 +0200
@@ -344,16 +344,16 @@
 	
 	RField * fullscreenField;
 	if ( Configuration::getWindowMode() ){
-		fullscreenField = option_menu.addMenu( "Fullscreen on", normalFont, true,INIT_SCREEN,&option_menu,select_smp);
+		fullscreenField = option_menu.addMenu( "Fullscreen off", normalFont, true,INIT_SCREEN,&option_menu,select_smp);
 	} else {
-		fullscreenField = option_menu.addMenu( "Fullscreen off",  normalFont, true,INIT_SCREEN,&option_menu,select_smp);
+		fullscreenField = option_menu.addMenu( "Fullscreen on",  normalFont, true,INIT_SCREEN,&option_menu,select_smp);
 	}
 
 	RField * backgroundField;
 	if ( Configuration::getBackground() ){
-		backgroundField = option_menu.addMenu( "Background off", normalFont, true, INIT_BACK, &option_menu, select_smp );
+		backgroundField = option_menu.addMenu( "Background on", normalFont, true, INIT_BACK, &option_menu, select_smp );
 	} else {
-		backgroundField = option_menu.addMenu( "Background on", normalFont, true, INIT_BACK, &option_menu, select_smp);
+		backgroundField = option_menu.addMenu( "Background off", normalFont, true, INIT_BACK, &option_menu, select_smp);
 	}
 	option_menu.addMenu( "Sound", normalFont, true, 800, &sound_menu, select_smp );
 	option_menu.addMenu( "Return to Menu", normalFont, true,800,NULL,select_smp);
@@ -540,11 +540,11 @@
 				Configuration::setBackground( ! Configuration::getBackground() );
 				if ( Configuration::getBackground() ){
 					// option_menu.replace( 5, "Background ON", &menuFont, true, INIT_BACK, &option_menu, select_smp );
-					string str( "Background Off" );
+					string str( "Background on" );
 					backgroundField->set( &str );
 				} else {
 					// option_menu.replace( 5, "Background off", &menuFont, true, INIT_BACK, &option_menu, select_smp );
-					string str( "Background On" );
+					string str( "Background off" );
 					backgroundField->set( &str );
 				}
 				break;

rafkill-1.2.2-spell.patch:

--- NEW FILE rafkill-1.2.2-spell.patch ---
--- rafkill-1.2.2/README.debian	2006-08-23 02:40:57.000000000 +0200
+++ rafkill-1.2.2/README	2006-08-24 21:46:55.000000000 +0200
@@ -10,7 +10,7 @@
 	-l			:	Run game without showing background.
 	-w			:	Run game in windowed mode.
 
-	If the game runs to slowly for you, try using a combination of -l -g#. 
+	If the game runs too slowly for you, try using a combination of -l -g#. 
 
 	In the game you can change whether to show a background and the speed of the game.
 Getting rid of the background should significantly increase the fps if less than desired rate.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rafkill/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 May 2006 07:01:07 -0000	1.2
+++ .cvsignore	24 Aug 2006 20:18:43 -0000	1.3
@@ -1 +1 @@
-rafkill-1.2.1.tar.gz
+rafkill-1.2.2.tar.gz


Index: rafkill.spec
===================================================================
RCS file: /cvs/extras/rpms/rafkill/devel/rafkill.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rafkill.spec	6 Jul 2006 18:58:56 -0000	1.2
+++ rafkill.spec	24 Aug 2006 20:18:43 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           rafkill
-Version:        1.2.1
-Release:        2%{?dist}
+Version:        1.2.2
+Release:        1%{?dist}
 Summary:        Top-down shooter with powerups
 Group:          Amusements/Games
 License:        GPL
@@ -8,11 +8,9 @@
 Source0:        http://download.sourceforge.net/raptorv2/%{name}-%{version}.tar.gz
 Source1:        rafkill.desktop
 Source2:        rafkill.6
-Source3:        COPYING
-Source4:        license-confirmation.txt
-Source5:        rafkill.png
-Patch0:         rafkill-1.2.1-debian.patch
-Patch1:         rafkill-1.2.1-options.patch
+Source3:        rafkill.png
+Patch0:         rafkill-1.2.2-spell.patch
+Patch1:         rafkill-1.2.2-menu.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  allegro-devel dumb-devel scons desktop-file-utils
 
@@ -24,9 +22,8 @@
 
 %prep
 %setup -q 
-%patch0 -p1 -z .debian
-%patch1 -p1 -z .options
-cp %{SOURCE3} %{SOURCE4} .
+%patch0 -p1 -z .spell
+%patch1 -p1 -z .menu
 # sigh hack hack hack
 FLAGS=""
 for i in $RPM_OPT_FLAGS; do
@@ -61,7 +58,7 @@
   --add-category X-Fedora                       \
   %{SOURCE1}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-install -p -m 644 %{SOURCE5} \
+install -p -m 644 %{SOURCE3} \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
 
 
@@ -84,7 +81,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README COPYING license-confirmation.txt
+%doc README COPYING
 %{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_mandir}/man6/%{name}.6.gz
@@ -93,6 +90,9 @@
 
 
 %changelog
+* Thu Aug 24 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.2-1
+- New upstream release 1.2.2
+
 * Thu Jul  6 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.1-2
 - Rebuild against new allegro to remove executable stack requirement caused
   by previous versions of allegro.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rafkill/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 May 2006 07:01:07 -0000	1.2
+++ sources	24 Aug 2006 20:18:43 -0000	1.3
@@ -1 +1 @@
-e27a24d5a0c2e92ba13815d8d6638a6b  rafkill-1.2.1.tar.gz
+cbed08af529da15748441d2859f3f846  rafkill-1.2.2.tar.gz


--- rafkill-1.2.1-debian.patch DELETED ---


--- rafkill-1.2.1-options.patch DELETED ---