rpms/pingus/devel pingus-0.7.0-cflags.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 pingus.desktop, 1.2, 1.3 pingus.spec, 1.4, 1.5 sources, 1.2, 1.3 pingus-20060721-datapath.patch, 1.1, NONE pingus-20060721-gettext.patch, 1.1, NONE
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Wed Aug 29 20:40:56 UTC 2007
Author: jwrdegoede
Update of /cvs/extras/rpms/pingus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2391
Modified Files:
.cvsignore pingus.desktop pingus.spec sources
Added Files:
pingus-0.7.0-cflags.patch
Removed Files:
pingus-20060721-datapath.patch pingus-20060721-gettext.patch
Log Message:
* Wed Aug 22 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.7.0-1
- New upstream release 0.7.0 final
- This changes pingus from a ClanLib app into an SDL app
- Drop patch to switch pingus translations to gettext as it has been rejected
by upstream, instead use pingus' own translation system
pingus-0.7.0-cflags.patch:
--- NEW FILE pingus-0.7.0-cflags.patch ---
diff -up pingus-0.7.0/src/SConscript.cflags pingus-0.7.0/src/SConscript
--- pingus-0.7.0/src/SConscript.cflags 2007-08-24 23:49:45.000000000 +0200
+++ pingus-0.7.0/src/SConscript 2007-08-29 21:31:19.000000000 +0200
@@ -21,7 +21,7 @@
import os
env = Environment(# ENV = {'PKG_CONFIG_PATH' : os.getenv('PKG_CONFIG_PATH')},
- CCFLAGS = ['-O2', '-Wall', '-Werror', '-g'],
+ CCFLAGS = os.environ['CCFLAGS'],
CPPDEFINES = ['ENABLE_BINRELOC'],
CPPPATH = ['..', '.'])
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pingus/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 25 Jul 2006 08:15:00 -0000 1.2
+++ .cvsignore 29 Aug 2007 20:40:24 -0000 1.3
@@ -1 +1 @@
-pingus-20060721.tar.gz
+pingus-0.7.0.tar.bz2
Index: pingus.desktop
===================================================================
RCS file: /cvs/extras/rpms/pingus/devel/pingus.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pingus.desktop 15 Aug 2007 08:55:55 -0000 1.2
+++ pingus.desktop 29 Aug 2007 20:40:24 -0000 1.3
@@ -2,7 +2,7 @@
Encoding=UTF-8
Name=Pingus
Comment=Guide the penguins safely home before they drop of the cliff
-Exec=pingus
+Exec=pingus -f
Icon=pingus.png
Terminal=false
StartupNotify=false
Index: pingus.spec
===================================================================
RCS file: /cvs/extras/rpms/pingus/devel/pingus.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pingus.spec 15 Aug 2007 08:55:55 -0000 1.4
+++ pingus.spec 29 Aug 2007 20:40:24 -0000 1.5
@@ -1,23 +1,17 @@
-%define snapshot_date 20060721
Name: pingus
Version: 0.7.0
-Release: 0.5.%{snapshot_date}%{?dist}
+Release: 1%{?dist}
Summary: Guide the penguins safely home before they drop of the cliff
Group: Amusements/Games
License: GPLv2+
URL: http://pingus.seul.org/
-# create this by doing:
-# svn checkout svn://svn.berlios.de/pingus/trunk
-# rm -fr `find trunk -name .svn`
-# mv trunk pingus-%{snapshot_date}
-# tar cvfz pingus-%{snapshot_date}.tar.gz pingus-%{snapshot_date}
-Source0: pingus-%{snapshot_date}.tar.gz
+Source0: http://pingus.seul.org/files/%{name}-%{version}.tar.bz2
Source1: pingus.desktop
Source2: pingus.png
-Patch0: pingus-20060721-gettext.patch
-Patch1: pingus-20060721-datapath.patch
+Patch0: pingus-0.7.0-cflags.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: ClanLib-devel desktop-file-utils automake gettext
+BuildRequires: SDL_mixer-devel SDL_image-devel boost-devel libpng-devel
+BuildRequires: boost desktop-file-utils
Requires: hicolor-icon-theme
%description
@@ -30,48 +24,20 @@
%prep
-%setup -q -n %{name}-%{snapshot_date}
-%patch0 -p1 -z .gettext
-%patch1 -p1 -z .datapath
-sed -i 's|$datadir/games/$PACKAGE|$datadir/$PACKAGE|g' configure.ac
-./autogen.sh
+%setup -q
+%patch0 -p1
%build
-%configure --disable-dependency-tracking --disable-rpath
-# we must rerun autoheader now, don't ask why. When doing a manual build this
-# is done automaticly
-autoheader
-/bin/sh ./config.status config.h
-echo "#define HAVE_GETTEXT" >> config.h
-make %{?_smp_mflags}
+export CCFLAGS="$RPM_OPT_FLAGS"
+scons
%install
rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-# put pingus in normal dirs instead of games dirs
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-mv $RPM_BUILD_ROOT%{_prefix}/games/%{name} $RPM_BUILD_ROOT%{_bindir}
-mv $RPM_BUILD_ROOT%{_datadir}/games/%{name}/* \
- $RPM_BUILD_ROOT%{_datadir}/%{name}
-# remove the developmemt utilities left in /usr/games
-rm $RPM_BUILD_ROOT/usr/games/*
-# fix missing metamap stuff
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/metamap
-install -m 644 data/metamap/metamap.xml \
- $RPM_BUILD_ROOT%{_datadir}/%{name}/metamap
-
-# fixup translation stuff
-pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
-for i in *.po; do
- POLANG=`echo $i|sed 's/\.po//'`
- mkdir -p $RPM_BUILD_ROOT%{_datadir}/locale/$POLANG/LC_MESSAGES
- msgfmt $i -o $RPM_BUILD_ROOT%{_datadir}/locale/$POLANG/LC_MESSAGES/pingus.mo
- rm $i
-done
-popd
-%find_lang %{name}
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6
+./install.sh $RPM_BUILD_ROOT%{_prefix}
+install -p -m 644 doc/%{name}.6 $RPM_BUILD_ROOT%{_mandir}/man6/
# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -100,9 +66,9 @@
fi
-%files -f %{name}.lang
+%files
%defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README TODO WISHLIST
+%doc AUTHORS COPYING ChangeLog NEWS README TODO
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
@@ -111,6 +77,12 @@
%changelog
+* Wed Aug 22 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.7.0-1
+- New upstream release 0.7.0 final
+- This changes pingus from a ClanLib app into an SDL app
+- Drop patch to switch pingus translations to gettext as it has been rejected
+ by upstream, instead use pingus' own translation system
+
* Wed Aug 15 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.7.0-0.5.20060721
- Update License tag for new Licensing Guidelines compliance
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pingus/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 25 Jul 2006 08:15:00 -0000 1.2
+++ sources 29 Aug 2007 20:40:24 -0000 1.3
@@ -1 +1 @@
-8d845e1344f62ebda8f2a36634ed35ca pingus-20060721.tar.gz
+d967a3c233aa094236eb2ce6a3e20dd8 pingus-0.7.0.tar.bz2
--- pingus-20060721-datapath.patch DELETED ---
--- pingus-20060721-gettext.patch DELETED ---
More information about the scm-commits
mailing list