Hello community, here is the log from the commit of package armagetron checked in at Tue Jun 5 00:45:52 CEST 2007. -------- --- armagetron/armagetron.changes 2006-01-25 21:34:22.000000000 +0100 +++ /mounts/work_src_done/STABLE/armagetron/armagetron.changes 2007-06-04 19:15:52.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jun 4 19:14:42 CEST 2007 - pth@suse.de + +- Move binary files to their correct place. + +------------------------------------------------------------------- Old: ---- armagetron-0.1.4.9.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ armagetron.spec ++++++ --- /var/tmp/diff_new_pack.G28752/_old 2007-06-05 00:45:28.000000000 +0200 +++ /var/tmp/diff_new_pack.G28752/_new 2007-06-05 00:45:28.000000000 +0200 @@ -1,11 +1,11 @@ # # spec file for package armagetron (Version 0.2.7.1) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # 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 @@ -14,14 +14,13 @@ BuildRequires: SDL_image-devel SDL_mixer-devel kdelibs3-devel Summary: OpenGL Game Similar to the Film Tron Version: 0.2.7.1 -Release: 4 -License: GPL +Release: 80 +License: GNU General Public License (GPL) Group: Amusements/Games/3D/Race Source: %{name}ad-%{version}.tar.bz2 Source1: armagetron_add.tar.gz Source2: %name.png Patch1: armagetron_add.diff -Patch2: armagetron-0.1.4.9.dif Patch3: armagetron-64-bit.diff patch6: armagetron-codecleanup.diff patch7: armagetron-autoreconf.diff @@ -30,7 +29,7 @@ PreReq: sh-utils fileutils %description -In this game you race against other players on a permanently moving +In this game, race against other players on a permanently moving lightcycle (virtual motorbike), which leaves a wall as a trace. The lightcycles can make 90 degree turns and accelerate when driven close to walls. The game is over if you hit a wall. The goal of the game is @@ -49,45 +48,53 @@ %patch6 %patch7 rm -f acconfig.h acinclude.m4 -%define bindir %_prefix/games -%define datadir %_prefix/share/games/%{name}ad +%define _prefix /usr +%define _bindir /usr/games +%define _datadir %_prefix/share/games/%{name}ad %define applnkdir /opt/kde3/share/applnk/Games %define mandir %_mandir/man6 %build autoreconf -fi -export CXXFLAGS="%optflags -fomit-frame-pointer -ffast-math \ --fexpensive-optimizations -W -Wall -fno-strict-aliasing" -./configure --enable-music --prefix=/usr/share --bindir=%bindir -sed -e s%@DATA_DIR@%\"%datadir\"%g -e 's%@CONFIG_DIR@%\"%datadir/config\"%g' config.h > config.h.new && mv config.h.new config.h +# Not yet there ... +#export CXXFLAGS="%optflags -fomit-frame-pointer -ffast-math -fexpensive-optimizations -W -Wall" +export CXXFLAGS="%optflags -fomit-frame-pointer -ffast-math -fexpensive-optimizations -W -Wall -fno-strict-aliasing" +./configure --enable-music \ + --prefix=%_prefix/share \ + --bindir=%_bindir \ + --datadir=%_datadir \ + --mandir=%_mandir \ + --infodir=%_infodir \ + --libdir=%{_libdir} +sed -e s%@DATA_DIR@%\"%_datadir\"%g -e 's%@CONFIG_DIR@%\"%_datadir/config\"%g' config.h > config.h.new && mv config.h.new config.h make %{?jobs:-j%jobs} %install rm -rf %buildroot -for dir in %bindir %datadir %applnkdir %mandir /usr/share/applications +for dir in %{_bindir} %{_datadir} %{applnkdir} %{_mandir} %{_prefix}/share/applications do - mkdir -p %{buildroot}$dir + mkdir -p %{buildroot}${dir} done make install DESTDIR=%buildroot -install armagetron_add/*.desktop %{buildroot}/usr/share/applications/ -mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/ -install -m 644 $RPM_SOURCE_DIR/%name.png $RPM_BUILD_ROOT/usr/share/pixmaps +install armagetron_add/*.desktop %{buildroot}%{_prefix}/share/applications/ +mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/pixmaps/ +install -m 644 $RPM_SOURCE_DIR/%name.png %{buildroot}%{_prefix}/share/pixmaps %suse_update_desktop_file Armagetron Game ArcadeGame -rm %buildroot/usr/share/games/armagetronad/bin/uninstall +rm -f %buildroot/usr/share/games/armagetronad/bin/uninstall rm -fr %buildroot/etc/armagetronad/.orig -rm -r %buildroot/usr/share/games/armagetronad/doc +rm -fr %buildroot/usr/share/games/armagetronad/doc rm %buildroot/usr/share/games/armagetronad/COPYING.txt -mv %buildroot/usr/share/bin/* %buildroot/%bindir +mv %buildroot/usr/share/bin/* %{buildroot}%{_bindir} rmdir %buildroot/usr/share/bin +mv %buildroot/usr/share/games/armagetronad/bin/* %{buildroot}%{_bindir} +rmdir %buildroot/usr/share/games/armagetronad/bin %files %defattr(-,root,root) %doc README bindist/doc/* armagetron_add/README.SuSE /etc/armagetronad - -%bindir/* - -%datadir +%{_bindir}/* +%_datadir %attr(644,root,root) /usr/share/applications/* /usr/share/pixmaps/%name.png @@ -100,9 +107,11 @@ fi %clean -rm -rf %{buildroot} +#rm -rf %{buildroot} -%changelog -n armagetron +%changelog +* Mon Jun 04 2007 - pth@suse.de +- Move binary files to their correct place. * Wed Jan 25 2006 - mls@suse.de - converted neededforbuild to BuildRequires * Thu Dec 01 2005 - pth@suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org