Hello community,
here is the log from the commit of package trackballs
checked in at Sun Aug 12 11:46:50 CEST 2007.
--------
--- trackballs/trackballs.changes 2007-07-02 06:52:11.000000000 +0200
+++ /mounts/work_src_done/STABLE/trackballs/trackballs.changes 2007-08-11 19:16:12.000000000 +0200
@@ -1,0 +2,8 @@
+Fri Aug 10 18:59:24 CEST 2007 - bk@suse.de
+
+- Update to 1.1.4 (much for fun wit new music), major points are:
+ * Added great new songs and level sets by Attila Boros
+ * Added custom backgrounds in the setup game mode for each levelset
+ * Huge improvements in the map editor
+
+-------------------------------------------------------------------
Old:
----
trackballs-1.1.1-codecleanup.diff
trackballs-1.1.1.tar.gz
trackballs.desktop
New:
----
tb_hrluebke.ogg
tb_plinkeplanke.ogg
tb_schizophrenia.ogg
tb_sorrow.ogg
trackballs-1.1.4-codecleanup.diff
trackballs-1.1.4.tar.bz2
void-funcs.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ trackballs.spec ++++++
--- /var/tmp/diff_new_pack.c10374/_old 2007-08-12 11:46:15.000000000 +0200
+++ /var/tmp/diff_new_pack.c10374/_new 2007-08-12 11:46:15.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package trackballs (Version 1.1.1)
+# spec file for package trackballs (Version 1.1.4)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -10,27 +10,31 @@
Name: trackballs
-BuildRequires: SDL_image-devel SDL_mixer-devel SDL_ttf-devel gcc-c++ guile-devel libdrm-devel libstdc++ libstdc++-devel update-desktop-files xorg-x11-Mesa-devel
+BuildRequires: SDL_image-devel SDL_mixer-devel SDL_ttf-devel gcc-c++ guile-devel hicolor-icon-theme libdrm-devel libstdc++ libstdc++-devel update-desktop-files xorg-x11-Mesa-devel
Summary: Trackballs - A Marble Madness-like Game
-Version: 1.1.1
-Release: 88
+Version: 1.1.4
+Release: 1
PreReq: permissions
AutoReqProv: on
Provides: trackballs-music
Obsoletes: trackballs-music
-Source0: trackballs-%version.tar.gz
+Source0: trackballs-%version.tar.bz2
Source1: tb_genesis.ogg
Source2: tb_design.ogg
-Source3: %name.desktop
Source4: %name.png
-Patch: trackballs-1.1.1-codecleanup.diff
+Source5: tb_hrluebke.ogg
+Source6: tb_plinkeplanke.ogg
+Source7: tb_schizophrenia.ogg
+Source8: tb_sorrow.ogg
+Patch: trackballs-%version-codecleanup.diff
Patch1: trackballs-off_by_one.diff
+Patch2: void-funcs.diff
Group: Amusements/Games/3D/Other
-License: GNU General Public License (GPL)
+License: GPL v2 or later
URL: http://trackballs.sf.net
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define _gamesbindir /usr/games
-%define _gamesdatadir /usr/share/games
+%define _gamesdatadir %{_datadir}
%define highscores /var/games/%name.scores
%description
@@ -54,58 +58,45 @@
%setup -q
%patch
%patch1
+%patch2
+sed -i 's/MimeType=application\/x-executable/&;/' share/icons/trackballs.desktop.in
%build
-sed 's/windowed=0/windowed=1/' src/settings.cc >src/settings.cc.new
-if diff src/settings.cc src/settings.cc.new; then exit 1; else
-mv src/settings.cc.new src/settings.cc;fi
+mkdir -p m4 # makes autoreconf happy
autoreconf -fi
-#autoheader
-#aclocal
-# Has a version mismatch problem which I don't understand, maybe all
-# old automake file should be cleaed up(like missing and so on) before:
-#automake -a
-#autoconf
-#export CFLAGS="%optflags -ffast-math -fexpensive-optimizations -fomit-frame-pointer"
-# "-ffast-math" does not work any longer with 1.0.0
-# "-fexpensive-optimizations" and "-fomit-frame-pointer" is enabled
-# with "-O2" anyway
export CFLAGS="%{optflags}"
%configure --bindir=%{_gamesbindir} \
--datadir=%{_gamesdatadir} \
--with-highscores=%highscores \
--mandir=%_mandir || {
- #--with-resolution=1
+ --with-resolution=2
grep '[og]:' config.log
exit 1
}
make
-#cd share/images
-#echo "\
-#displayHighscoreBackground.jpg 1024x768
-#setupBackground.jpg 800x600
-#splashScreen.jpg 932x704" |
-#while read file size
-#do
-# convert -size $size $file -resize $size $file.new &&
-# mv $file $file.orig &&
-# mv $file.new $file
-#done
%install
-rm -rf %buildroot
%makeinstall
-#mandir=%buildroot/%_datadir
if [ -f %buildroot/%{_gamesbindir}/%{_target_platform}-%{name} ] ; then
-mv %buildroot/%{_gamesbindir}/%{_target_platform}-%{name} \
+ mv %buildroot/%{_gamesbindir}/%{_target_platform}-%{name} \
%buildroot/%{_gamesbindir}/%{name}
fi
-install -d "$RPM_BUILD_ROOT"/%{_gamesdatadir}/trackballs/music/
-install -c %{SOURCE1} %buildroot/%{_gamesdatadir}/%{name}/music/tb_genesis.ogg
-install -c %{SOURCE2} %buildroot/%{_gamesdatadir}/%{name}/music/tb_design.ogg
-mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/
+install -d %buildroot/%_gamesdatadir/%name/music/
+install %SOURCE1 %buildroot/%_gamesdatadir/%name/music/
+install %SOURCE2 %buildroot/%_gamesdatadir/%name/music/
+install %SOURCE5 %buildroot/%_gamesdatadir/%name/music/
+install %SOURCE6 %buildroot/%_gamesdatadir/%name/music/
+install %SOURCE7 %buildroot/%_gamesdatadir/%name/music/
+install %SOURCE8 %buildroot/%_gamesdatadir/%name/music/
+mkdir -p %buildroot/usr/share/pixmaps/
install -m 644 $RPM_SOURCE_DIR/%name.png $RPM_BUILD_ROOT/usr/share/pixmaps
-%suse_update_desktop_file -i %name Game ArcadeGame
+%suse_update_desktop_file -i %name ArcadeGame
+%find_lang %name
+cd %buildroot
+if [ -d usr/share/trackballs/locale ]; then
+ mv usr/share/trackballs/locale usr/share
+fi
+mv usr/share/trackballs/*.html ~-
%post
%run_permissions
@@ -113,31 +104,29 @@
%verifyscript
%verify_permissions -e /usr/games/trackballs
-%files
+%files -f %name.lang
%defattr(-,root,root)
-%attr(-,root,root) %doc AUTHORS ChangeLog FAQ NEWS README TODO README.html header.jpg editor.jpg screen.jpg
+%attr(-,root,root) %doc AUTHORS ChangeLog FAQ NEWS README TODO *.jpg *.html
%attr(644,root,root) %{_mandir}/man6/%{name}.6.*
%defattr(-,games,games)
-%dir %{_gamesdatadir}/%{name}
-%attr(755,games,games) %dir %{_gamesdatadir}/%{name}/music
-%{_gamesdatadir}/%{name}/fonts/.
-%{_gamesdatadir}/%{name}/images/.
-%attr(644,games,games) %{_gamesdatadir}/%{name}/music/tb_genesis.ogg
-%attr(644,games,games) %{_gamesdatadir}/%{name}/music/tb_design.ogg
-%{_gamesdatadir}/%{name}/levels/.
-%{_gamesdatadir}/%{name}/sfx/.
+%{_gamesdatadir}/%{name}
# Binariy set-gid game:
%verify(not mode) %attr(0755,games,games) %{_gamesbindir}/%{name}
# Scores group-writeable for game:
%attr(664,games,games) %highscores
/usr/share/applications/%name.desktop
/usr/share/pixmaps/%name.png
-%{_gamesdatadir}/%{name}/locale/
+%{_datadir}/icons/hicolor/*/apps/trackballs.png
%clean
rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Aug 10 2007 - bk@suse.de
+- Update to 1.1.4 (much for fun wit new music), major points are:
+ * Added great new songs and level sets by Attila Boros
+ * Added custom backgrounds in the setup game mode for each levelset
+ * Huge improvements in the map editor
* Mon Jul 02 2007 - aj@suse.de
- Fix typo in last change.
* Fri Jun 29 2007 - pth@suse.de
++++++ tb_design.ogg ++++++
Files trackballs/tb_design.ogg and /mounts/work_src_done/STABLE/trackballs/tb_design.ogg differ
++++++ tb_genesis.ogg ++++++
Files trackballs/tb_genesis.ogg and /mounts/work_src_done/STABLE/trackballs/tb_genesis.ogg differ
++++++ trackballs-1.1.1-codecleanup.diff -> trackballs-1.1.4-codecleanup.diff ++++++
--- trackballs/trackballs-1.1.1-codecleanup.diff 2005-11-18 10:12:45.000000000 +0100
+++ /mounts/work_src_done/STABLE/trackballs/trackballs-1.1.4-codecleanup.diff 2007-07-10 17:21:29.000000000 +0200
@@ -1,16 +1,3 @@
-diff -u -r ../trackballs-1.1.1.orig/src/editMode.cc ./src/editMode.cc
---- ../trackballs-1.1.1.orig/src/editMode.cc 2005-11-17 15:18:37.328052905 +0100
-+++ ./src/editMode.cc 2005-11-17 15:27:02.631327997 +0100
-@@ -584,7 +584,7 @@
-
- default:
- /* TODO. Not implemented yet? */
-- printf("Command %d not yet implemented\n");
-+ printf("Command %d not yet implemented\n",command);
- break;
- }
- }
-diff -u -r ../trackballs-1.1.1.orig/src/font.cc ./src/font.cc
--- ../trackballs-1.1.1.orig/src/font.cc 2005-11-17 15:18:37.518019849 +0100
+++ ./src/font.cc 2005-11-17 15:25:04.108830070 +0100
@@ -207,6 +207,7 @@
@@ -57,24 +44,6 @@
}
-@@ -625,6 +626,7 @@
- // and add it in the list
- i = loadTexture(name);
- glBindTexture(GL_TEXTURE_2D,textures[i]);
-+ return 0;
- }
-
- int resetTextures() {
-@@ -655,7 +657,7 @@
- SDL_FreeSurface(surface);
- }
- }
--
-+ return 1;
- }
-
- /* Calculates and displays current framerate */
-diff -u -r ../trackballs-1.1.1.orig/src/guile.cc ./src/guile.cc
--- ../trackballs-1.1.1.orig/src/guile.cc 2005-11-17 15:18:37.636999145 +0100
+++ ./src/guile.cc 2005-11-17 15:18:52.901342971 +0100
@@ -880,11 +880,11 @@
@@ -118,7 +87,7 @@
@@ -1197,6 +1200,7 @@
{
SCM_ASSERT(SCM_NUMBERP(t),t,SCM_ARG1,FUNC_NAME);
- Game::current->restartBonusTime=scm_num2dbl(t,FUNC_NAME);
+ Game::current->player1->timeOnDeath=scm_num2dbl(t,FUNC_NAME);
+ return 0;
}
#undef FUNC_NAME
++++++ void-funcs.diff ++++++
--- src/glHelp.cc 2007/07/10 15:15:32 1.1
+++ src/glHelp.cc 2007/07/10 16:23:44
@@ -62,9 +62,7 @@
void draw2DString(TTF_Font *font,char *string, int x,int y,Uint8 red, Uint8 green, Uint8 blue) {
int w,h;
SDL_Color fgColor={255,255,255};
- SDL_Color bgColor={0,0,0};
SDL_Surface *text;
- SDL_Rect rect;
GLuint texture;
GLfloat texcoord[4];
GLfloat texMinX, texMinY;
@@ -516,7 +514,6 @@
void glHelpInit() {
char str[256];
- GLfloat texCoords[4];
qobj = gluNewQuadric();
gluQuadricDrawStyle(qobj,GLU_FILL);
@@ -612,12 +609,12 @@
#define FRAME 50
-int bindTexture(char *name) {
+void bindTexture(char *name) {
int i;
for(i=0;i