Hello community,
here is the log from the commit of package madbomber
checked in at Mon Dec 11 01:43:48 CET 2006.
--------
--- madbomber/madbomber.changes 2006-01-27 14:32:25.000000000 +0100
+++ /mounts/work_src_done/STABLE/madbomber/madbomber.changes 2006-12-08 17:50:28.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Dec 8 17:38:30 CET 2006 - anicka@suse.cz
+
+- fix invalid operation
+- build with $RPM_OPT_FLAGS
+
+-------------------------------------------------------------------
Old:
----
madbomber-0.2.5-permissions.patch
madbomber-0.2.5.patch
New:
----
madbomber-0.2.5-invalid-operation.diff
madbomber-0.2.5-makefile.diff
madbomber-0.2.5-permissions.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ madbomber.spec ++++++
--- /var/tmp/diff_new_pack.uMXH2I/_old 2006-12-11 01:43:31.000000000 +0100
+++ /var/tmp/diff_new_pack.uMXH2I/_new 2006-12-11 01:43:31.000000000 +0100
@@ -5,7 +5,7 @@
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
-# Please submit bugfixes or comments via http://bugs.opensuse.org
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
@@ -13,16 +13,17 @@
# Commandline:
Name: madbomber
BuildRequires: SDL_image-devel SDL_mixer-devel gcc-c++ update-desktop-files
-License: GPL
+License: GNU General Public License (GPL)
Group: Amusements/Games/Action/Arcade
Summary: A Clone of the Atari Game Kaboom!
Version: 0.2.5
-Release: 276
+Release: 313
URL: http://www.newbreedsoftware.com/madbomber/
Source: madbomber-%{version}.tar.bz2
Source1: %name.desktop
-Patch: madbomber-%{version}.patch
-Patch1: %{name}-%{version}-permissions.patch
+Patch: madbomber-%{version}-makefile.diff
+Patch1: %{name}-%{version}-permissions.diff
+Patch2: %{name}-%{version}-invalid-operation.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -37,9 +38,10 @@
Bill Kendrick
%prep
-%setup
+%setup -q
%patch
%patch1
+%patch2
%build
make
@@ -63,6 +65,9 @@
/usr/share/pixmaps/%name.png
%changelog -n madbomber
+* Fri Dec 08 2006 - anicka@suse.cz
+- fix invalid operation
+- build with $RPM_OPT_FLAGS
* Fri Jan 27 2006 - nadvornik@suse.cz
- fixed BuildRequires
* Wed Jan 25 2006 - mls@suse.de
++++++ madbomber-0.2.5-invalid-operation.diff ++++++
--- madbomber.c
+++ madbomber.c
@@ -4823,7 +4823,7 @@
/* Pause: */
- spray_count = spray_count++;
+ spray_count++;
if ((spray_count % 3) == 0 && quick_spray == 0)
SDL_Delay(10);
++++++ madbomber-0.2.5-makefile.diff ++++++
--- Makefile
+++ Makefile
@@ -9,8 +9,8 @@
# User-definable stuff:
-BIN_PREFIX=/usr/local/bin/
-DATA_PREFIX=/usr/share/madbomber/
+BIN_PREFIX=/usr/bin/
+DATA_PREFIX=/usr/share/games/madbomber/
# Defaults for Linux:
@@ -19,7 +19,7 @@
TARGET_DEF=LINUX
SDL_CFLAGS := $(shell sdl-config --cflags)
SDL_LDFLAGS := $(shell sdl-config --libs)
-
+CXX = g++
# Sound-related definitions:
@@ -31,7 +31,7 @@
# Stuff we pass to the compiler:
CFLAGS=-Wall $(SDL_CFLAGS) \
- -DDATA_PREFIX=\"$(DATA_PREFIX)\" -D$(NOSOUNDFLAG) -D$(TARGET_DEF)
+ -DDATA_PREFIX=\"$(DATA_PREFIX)\" -D$(NOSOUNDFLAG) -D$(TARGET_DEF) $(RPM_OPT_FLAGS)
SDL_LIB=$(MIXER) $(IMAGE) $(SDL_LDFLAGS)
@@ -40,13 +40,13 @@
all: $(TARGET)
install:
- mkdir -p $(DATA_PREFIX)
- cp -r data/* $(DATA_PREFIX)
- chown -R root.root $(DATA_PREFIX)
- chmod -R a+rX,g-w,o-w $(DATA_PREFIX)
- cp madbomber $(BIN_PREFIX)
- chown root.root $(BIN_PREFIX)/madbomber
- chmod a+rx,g-w,o-w $(BIN_PREFIX)/madbomber
+ install -d -m 755 $(DESTDIR)$(DATA_PREFIX)
+ install -d -m 755 $(DESTDIR)$(BIN_PREFIX)
+ cp -r data/* $(DESTDIR)$(DATA_PREFIX)
+ chown -R root:root $(DESTDIR)$(DATA_PREFIX)
+ chmod -R a+rX,g-w,o-w $(DESTDIR)$(DATA_PREFIX)
+ cp madbomber $(DESTDIR)$(BIN_PREFIX)
+ chmod 755 $(DESTDIR)$(BIN_PREFIX)/madbomber
nosound:
@@ -78,7 +78,7 @@
# Main executable:
$(TARGET): madbomber.o
- $(CC) $(CFLAGS) madbomber.o -o $(TARGET) $(SDL_LIB) -lm
+ $(CXX) $(CFLAGS) madbomber.o -o $(TARGET) $(SDL_LIB) -lm
# Main object:
++++++ madbomber-0.2.5-permissions.diff ++++++
--- Makefile
+++ Makefile
@@ -43,7 +43,6 @@
install -d -m 755 $(DESTDIR)$(DATA_PREFIX)
install -d -m 755 $(DESTDIR)$(BIN_PREFIX)
cp -r data/* $(DESTDIR)$(DATA_PREFIX)
- chown -R root:root $(DESTDIR)$(DATA_PREFIX)
chmod -R a+rX,g-w,o-w $(DESTDIR)$(DATA_PREFIX)
cp madbomber $(DESTDIR)$(BIN_PREFIX)
chmod 755 $(DESTDIR)$(BIN_PREFIX)/madbomber
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
