Hello community, here is the log from the commit of package pingus for openSUSE:Factory checked in at Mon Sep 5 16:55:28 CEST 2011. -------- --- pingus/pingus.changes 2010-07-31 15:52:09.000000000 +0200 +++ pingus/pingus.changes 2011-09-05 11:15:09.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Sep 5 11:14:29 CEST 2011 - meissner@suse.de + +- fix build with --dt-needed... + +------------------------------------------------------------------- +Thu Jul 7 13:06:38 UTC 2011 - cwh@novell.com + +- fixed build for gcc46 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- dsolink.patch gcc46.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pingus.spec ++++++ --- /var/tmp/diff_new_pack.Z6f5uE/_old 2011-09-05 16:43:57.000000000 +0200 +++ /var/tmp/diff_new_pack.Z6f5uE/_new 2011-09-05 16:43:57.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package pingus (Version 0.7.3) +# spec file for package pingus # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,12 +27,14 @@ Url: http://pingus.seul.org/ AutoReqProv: on Version: 0.7.3 -Release: 1 +Release: 5 Summary: A Lemmings Clone Source: http://pingus.seul.org/files/pingus-%{version}.tar.bz2 Source2: %{name}.desktop Source3: %{name}.png Patch1: pingus-cwiid_with_bluez.patch +Patch2: gcc46.patch +Patch3: dsolink.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -43,6 +45,8 @@ %prep %setup -q %patch1 +%patch2 +%patch3 -p1 %build CFLAGS="${RPM_OPT_FLAGS/-D_FORTIFY_SOURCE=2/-D_FORTIFY_SOURCE=1}" @@ -53,7 +57,7 @@ %install ./install.sh $RPM_BUILD_ROOT%{_prefix} -chmod -x $RPM_BUILD_ROOT%{_datadir}/pingus/data/gen-scrfile.scm +#chmod -x $RPM_BUILD_ROOT%{_datadir}/pingus/data/gen-scrfile.scm mv $RPM_BUILD_ROOT%{_prefix}/{bin,games} mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/ install -m 644 $RPM_SOURCE_DIR/%{name}.png $RPM_BUILD_ROOT%{_datadir}/pixmaps @@ -71,4 +75,5 @@ %{_datadir}/pingus %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png + %changelog ++++++ dsolink.patch ++++++ Index: pingus-0.7.3/src/input/SConstruct.main =================================================================== --- pingus-0.7.3.orig/src/input/SConstruct.main +++ pingus-0.7.3/src/input/SConstruct.main @@ -6,7 +6,7 @@ env = Environment(CCFLAGS = ['-O0', '-W LIBS = ['cwiid']) env.ParseConfig('sdl-config --cflags --libs') -env['LIBS'] += ['SDL_image', 'SDL_mixer', 'png'] +env['LIBS'] += ['SDL_image', 'SDL_mixer', 'png', 'X11'] env.Program('main', [ 'main.cpp', Index: pingus-0.7.3/SConstruct =================================================================== --- pingus-0.7.3.orig/SConstruct +++ pingus-0.7.3/SConstruct @@ -469,7 +469,7 @@ if ('configure' in COMMAND_LINE_TARGETS) else: reports += " * XInput support: yes\n" config_h_defines += [('HAVE_XINPUT', 1)] - env['LIBS'] += ['Xi'] + env['LIBS'] += ['Xi','X11'] env['optional_sources'] += ['src/input/xinput_driver.cpp', 'src/input/xinput_device.cpp'] ++++++ gcc46.patch ++++++ --- src/input/wiimote.cpp.orig 2011-07-07 12:13:23.000000000 +0200 +++ src/input/wiimote.cpp 2011-07-07 12:13:26.000000000 +0200 @@ -142,7 +142,7 @@ assert(m_wiimote == 0); /* Connect to any wiimote */ - bdaddr_t bdaddr = *BDADDR_ANY; + bdaddr_t bdaddr = (bdaddr_t) {{0, 0, 0, 0, 0, 0}}; /* Connect to address in string WIIMOTE_BDADDR */ /* str2ba(WIIMOTE_BDADDR, &bdaddr); */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org