Hello community,
here is the log from the commit of package pingus
checked in at Wed Jun 6 18:16:27 CEST 2007.
--------
--- pingus/pingus.changes 2007-04-13 01:17:03.000000000 +0200
+++ /mounts/work_src_done/STABLE/pingus/pingus.changes 2007-06-06 13:39:31.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Jun 6 13:38:18 CEST 2007 - prusnak@suse.cz
+
+- modified Makefile.in to accept DESTDIR (destdir.patch)
+- cleaned spec file
+
+-------------------------------------------------------------------
@@ -223 +229 @@
-Mon May 10 13:02:52 MEST 1999 - sndirsch@suse.de
+Tue May 11 15:08:06 MEST 1999 - sndirsch@suse.de
@@ -225 +231 @@
-- created SPEC file
+- updated package to release 0.0.14 (now two additional levels)
@@ -228 +233,0 @@
-Tue May 11 15:08:06 MEST 1999 - sndirsch@suse.de
@@ -230 +235,4 @@
-- updated package to release 0.0.14 (now two additional levels)
+Mon May 10 13:02:52 MEST 1999 - sndirsch@suse.de
+
+- created SPEC file
+
Old:
----
assert.dif
pingus-0.6.0.dif
pingus-snow11.diff
New:
----
pingus-0.6.0-assert.patch
pingus-0.6.0-destdir.patch
pingus-0.6.0.patch
pingus-0.6.0-snow11.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pingus.spec ++++++
--- /var/tmp/diff_new_pack.I32305/_old 2007-06-06 18:15:21.000000000 +0200
+++ /var/tmp/diff_new_pack.I32305/_new 2007-06-06 18:15:21.000000000 +0200
@@ -18,16 +18,17 @@
URL: http://pingus.seul.org/
Autoreqprov: on
Version: 0.6.0
-Release: 341
+Release: 363
Summary: A Lemmings Clone
-Source: pingus-%{version}.tar.bz2
-Source1: pingus.sh
-Source2: %name.desktop
-Source3: %name.png
-Patch: pingus-%{version}.dif
-Patch1: assert.dif
-Patch2: pingus-snow11.diff
-Patch3: pingus-%{version}-gcc4.patch
+Source: %{name}-%{version}.tar.bz2
+Source1: %{name}.sh
+Source2: %{name}.desktop
+Source3: %{name}.png
+Patch0: %{name}-%{version}.patch
+Patch1: %{name}-%{version}-assert.patch
+Patch2: %{name}-%{version}-snow11.patch
+Patch3: %{name}-%{version}-gcc4.patch
+Patch4: %{name}-%{version}-destdir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -43,42 +44,43 @@
%prep
%setup -q
-%patch
+%patch0
%patch1
%patch2
%patch3
+%patch4
%build
rm -f m4/gettext.m4
autoreconf --force --install
-CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" ./configure \
- --prefix=/usr --mandir=%{_mandir}
+%configure
make %{?jobs:-j%jobs}
%install
-rm -rf $RPM_BUILD_ROOT
-make prefix=$RPM_BUILD_ROOT/usr \
- mandir=$RPM_BUILD_ROOT/%{_mandir} install
-install -m 755 $RPM_SOURCE_DIR/pingus.sh $RPM_BUILD_ROOT/usr/games/pingus.sh
-mkdir -p $RPM_BUILD_ROOT/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
+make MKINSTALLDIRS=mkinstalldirs DESTDIR=$RPM_BUILD_ROOT install
+install -m 755 $RPM_SOURCE_DIR/pingus.sh $RPM_BUILD_ROOT%{_prefix}/games/pingus.sh
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/
+install -m 644 $RPM_SOURCE_DIR/%{name}.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
+%suse_update_desktop_file -i %{name} Game ArcadeGame
+%find_lang %{name}
%clean
rm -rf $RPM_BUILD_ROOT
-%files
+%files -f %name.lang
%defattr(-,root,root)
%doc AUTHORS COPYING INSTALL NEWS README TODO
%doc %{_mandir}/man6/pingus.6.gz
-/usr/games/pingus
-/usr/games/pingus.sh
-/usr/share/games/pingus
-/usr/share/locale/*/LC_MESSAGES/pingus.mo
-/usr/share/applications/%name.desktop
-/usr/share/pixmaps/%name.png
+%{_prefix}/games/pingus
+%{_prefix}/games/pingus.sh
+%{_datadir}/games/pingus
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/pixmaps/%{name}.png
%changelog
+* Wed Jun 06 2007 - prusnak@suse.cz
+- modified Makefile.in to accept DESTDIR (destdir.patch)
+- cleaned spec file
* Fri Apr 13 2007 - ro@suse.de
- added libmikmod-devel to buildreq
* Tue Sep 12 2006 - dmueller@suse.de
++++++ pingus-0.6.0-assert.patch ++++++
--- src/blitter.cxx
+++ src/blitter.cxx
@@ -28,6 +28,8 @@
#include "debug.hxx"
#include "blitter_impl.hxx"
+#include
+
/* Headers needed for i18n / gettext */
#include "my_gettext.hxx"
--- src/col_map.cxx
+++ src/col_map.cxx
@@ -24,6 +24,8 @@
#include "col_map.hxx"
#include "my_gettext.hxx"
+#include
+
#define COLMAP_WITH_MEMORY_HOLE 1
// Obtain the colmap from a memory area
--- src/console.cxx
+++ src/console.cxx
@@ -24,6 +24,8 @@
#include "console.hxx"
#include "math.hxx"
+#include
+
using std::ostream;
// Globale console
--- src/demo_recorder.cxx
+++ src/demo_recorder.cxx
@@ -25,6 +25,8 @@
#include "plf.hxx"
#include "my_gettext.hxx"
+#include
+
DemoRecorder::DemoRecorder (Server* server)
: record_demo (true)
{
--- src/editor/generic_property_frame.cxx
+++ src/editor/generic_property_frame.cxx
@@ -27,6 +27,8 @@
#include "../string_converter.hxx"
#include "generic_property_frame.hxx"
+#include
+
namespace EditorNS {
class IntegerDataBox : public DataBox
--- src/gui/root_gui_manager.cxx
+++ src/gui/root_gui_manager.cxx
@@ -20,6 +20,8 @@
#include "root_gui_manager.hxx"
#include "../input/controller.hxx"
+#include
+
using namespace GUI;
using namespace Input;
--- src/pingu_holder.cxx
+++ src/pingu_holder.cxx
@@ -22,6 +22,8 @@
#include "pingu.hxx"
#include "plf.hxx"
+#include
+
PinguHolder::PinguHolder(PLF* plf)
: number_of_allowed(plf->get_pingus()),
number_of_exited(0)
--- src/savegame_manager.cxx
+++ src/savegame_manager.cxx
@@ -23,6 +23,8 @@
#include "xml_helper.hxx"
#include "savegame_manager.hxx"
+#include
+
SavegameManager* SavegameManager::instance_;
SavegameManager*
--- src/worldmap/dot.cxx
+++ src/worldmap/dot.cxx
@@ -21,6 +21,8 @@
#include "../xml_file_reader.hxx"
#include "dot.hxx"
+#include
+
namespace WorldMapNS {
Dot::Dot(xmlDocPtr doc, xmlNodePtr cur)
--- src/worldmap/graph.hxx
+++ src/worldmap/graph.hxx
@@ -23,6 +23,8 @@
#include <algorithm>
#include <vector>
+#include
+
namespace WorldMapNS {
typedef int NodeId;
++++++ pingus-0.6.0-destdir.patch ++++++
--- Makefile.in
+++ Makefile.in
@@ -31,6 +31,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+DESTDIR =
+
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -134,14 +136,14 @@
am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__quote = @am__quote@
-bindir = @bindir@
+bindir = $(DESTDIR)@bindir@
build = @build@
build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
+datadir = $(DESTDIR)@datadir@
+exec_prefix = $(DESTDIR)@exec_prefix@
extra_includes = @extra_includes@
extra_libraries = @extra_libraries@
host = @host@
@@ -149,19 +151,19 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
+includedir = $(DESTDIR)@includedir@
+infodir = $(DESTDIR)@infodir@
install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
+libdir = $(DESTDIR)@libdir@
+libexecdir = $(DESTDIR)@libexecdir@
+localstatedir = $(DESTDIR)@localstatedir@
+mandir = $(DESTDIR)@mandir@
+oldincludedir = $(DESTDIR)@oldincludedir@
+prefix = $(DESTDIR)@prefix@
program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
+sbindir = $(DESTDIR)@sbindir@
+sharedstatedir = $(DESTDIR)@sharedstatedir@
+sysconfdir = $(DESTDIR)@sysconfdir@
target_alias = @target_alias@
SUBDIRS = m4 intl src data doc po contrib
++++++ pingus-0.6.0.dif -> pingus-0.6.0.patch ++++++
--- pingus/pingus-0.6.0.dif 2004-07-21 17:43:40.000000000 +0200
+++ /mounts/work_src_done/STABLE/pingus/pingus-0.6.0.patch 2007-05-29 15:06:38.000000000 +0200
@@ -3,10 +3,10 @@
@@ -55,7 +55,8 @@
dnl AM_WITH_NLS
dnl AM_LC_MESSAGES
- AM_ICONV
-- AM_GNU_GETTEXT
-+AM_GNU_GETTEXT
-+AM_GNU_GETTEXT_VERSION(0.11.5)
+- AM_ICONV
++ AM_ICONV
+ AM_GNU_GETTEXT
++ AM_GNU_GETTEXT_VERSION(0.11.5)
else
echo "Gnu gettext disabled"
dnl We probally need a AC_SUBST(@INTLLIBS@) here
++++++ pingus-0.6.0-snow11.patch ++++++
--- ./data/levels/tutorial/snow11-grumbel.xml.orig 2004-11-05 10:05:25.595110552 +0100
+++ ./data/levels/tutorial/snow11-grumbel.xml 2004-11-05 10:05:57.198557925 +0100
@@ -10,7 +10,7 @@
<description lang="en">It's panic time again. The Pingus will not come out very fast, but
since they turn around on walls you soon will have some trouble
- coordinating them all. Since you only need to save 3 it should be doable,
+ coordinating them all. Since you only need to save 5 it should be doable,
but if all fails use the pause-mode ('p') to get an overview again.
</description>
<description lang="de">Es ist wieder Zeit f�r Panik. Die Pingus kommen nicht sehr schnell heraus,
@@ -33,7 +33,7 @@
</description>
<description lang="sr">Ponovo je vreme za paniku. Pingusi nece brzo ulaziti, ali posto
se kod zidova okrecu, ubrzo ce biti tesko koordinirati ih sve. Posto je
- potrebno spasiti samo 3, trebalo bi da je izvodljivo. Ako ne uspe iz
+ potrebno spasiti samo 5, trebalo bi da je izvodljivo. Ako ne uspe iz
prve koristite pauzu (taster 'p') da bolje sagledate nivo.
</description>
++++++ pingus.desktop ++++++
--- pingus/pingus.desktop 2003-09-23 12:01:36.000000000 +0200
+++ /mounts/work_src_done/STABLE/pingus/pingus.desktop 2007-06-06 11:42:24.000000000 +0200
@@ -1,4 +1,5 @@
[Desktop Entry]
+Encoding=UTF-8
Type=Application
Name=Pingus
Exec=pingus -f
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org