rpms/ballz/devel ballz-1.0-guichan081.patch, NONE, 1.1 ballz.spec, 1.4, 1.5

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	ballz.spec 
Added Files:
	ballz-1.0-guichan081.patch 
Log Message:
* Wed Jul 30 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-4
- Rebuild for new guichan


ballz-1.0-guichan081.patch:

--- NEW FILE ballz-1.0-guichan081.patch ---
--- ballz-1.0/src/game.cpp.orig	2008-07-28 19:49:24.000000000 -0700
+++ ballz-1.0/src/game.cpp	2008-07-28 19:49:35.000000000 -0700
@@ -144,7 +144,7 @@
                                     "up with the whole idea of making this game in Per's and\n"
                                     "Johanna's apartment.");
     mCreditsText->setOpaque(false);
-    mCreditsText->setBorderSize(0);
+    mCreditsText->setFrameSize(0);
     mCreditsContainer->add(mCreditsText, 40, 180);
 
     mLevelsContainer = new gcn::Container();
@@ -173,7 +173,7 @@
     mInfoTextFont->setGlyphSpacing(-1);
     mInfoText->setFont(mInfoTextFont);
     mInfoText->setOpaque(false);
-    mInfoText->setBorderSize(0);
+    mInfoText->setFrameSize(0);
     mMainMenuContainer->add(mInfoText, 110, 200);
 }
 
--- ballz-1.0/src/gui/ballzscrollarea.cpp.orig	2008-07-28 19:54:05.000000000 -0700
+++ ballz-1.0/src/gui/ballzscrollarea.cpp	2008-07-28 19:54:18.000000000 -0700
@@ -37,7 +37,7 @@
 	setScrollPolicy(SHOW_NEVER,	SHOW_ALWAYS);
 	addKeyListener(this);
 	setFocusable(false);
-	setBorderSize(0);
+	setFrameSize(0);
 }
 
 void BallzScrollArea::draw(gcn::Graphics *graphics)
--- ballz-1.0/src/gui/ballzlistbox.cpp.orig	2008-07-28 19:57:26.000000000 -0700
+++ ballz-1.0/src/gui/ballzlistbox.cpp	2008-07-28 19:57:36.000000000 -0700
@@ -36,7 +36,7 @@
 
 BallzListBox::BallzListBox()
 {
-	setBorderSize(0);
+	setFrameSize(0);
     mSelectedImage = ResourceHandler::getInstance()->getBitmap("hand.bmp");
 }
 
--- ballz-1.0/src/gui/levelselector.cpp.orig	2008-07-28 19:54:46.000000000 -0700
+++ ballz-1.0/src/gui/levelselector.cpp	2008-07-28 19:54:54.000000000 -0700
@@ -40,7 +40,7 @@
 
 LevelSelector::LevelSelector()
 {
-	setBorderSize(0);
+	setFrameSize(0);
     mSelectedImage = ResourceHandler::getInstance()->getBitmap("hand.bmp");
     mSelected = -1;
     setWidth(300);
@@ -170,7 +170,7 @@ void LevelSelector::keyPressed(gcn::KeyE
 
     if (key.getValue() == gcn::Key::ENTER || key.getValue() == gcn::Key::SPACE)
     {
-        generateAction();
+        distributeActionEvent();
         keyEvent.consume();
     }
     else if (key.getValue() == gcn::Key::UP)


Index: ballz.spec
===================================================================
RCS file: /cvs/extras/rpms/ballz/devel/ballz.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ballz.spec	5 Apr 2008 08:29:09 -0000	1.4
+++ ballz.spec	30 Jul 2008 21:34:01 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           ballz
 Version:        1.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Platform game with some puzzle elements
 Group:          Amusements/Games
 License:        BSD
@@ -11,6 +11,7 @@
 Source1:        %{name}.desktop
 Patch0:         ballz-1.0-syslibs.patch
 Patch1:         ballz-1.0-fullscreen.patch
+Patch2:         ballz-1.0-guichan081.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  dumb-devel guichan-devel desktop-file-utils automake
 BuildRequires:  ImageMagick
@@ -30,6 +31,7 @@
 %setup -q
 %patch0 -p1 -z .syslibs
 %patch1 -p1 -z .fullscreen
+%patch2 -p1
 # we use the system version of these libs
 rm -fr src/guichan* src/dumb
 # remove hardcoded optflags from configure
@@ -83,6 +85,9 @@
 
 
 %changelog
+* Wed Jul 30 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-4
+- Rebuild for new guichan
+
 * Sat Apr  5 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-3
 - Rebuild for new guichan