rpms/raidem/FC-5 raidem-0.3.1-syslibs.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 raidem.spec, 1.3, 1.4 sources, 1.2, 1.3 raidem-0.3-loadpng.patch, 1.1, NONE raidem-0.3-no-mp3.patch, 1.1, NONE raidem-0.3-syslibs.patch, 1.1, NONE raidem-0.3-warn.patch, 1.1, NONE
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Mon May 1 16:34:18 UTC 2006
Author: jwrdegoede
Update of /cvs/extras/rpms/raidem/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14240
Modified Files:
.cvsignore raidem.spec sources
Added Files:
raidem-0.3.1-syslibs.patch
Removed Files:
raidem-0.3-loadpng.patch raidem-0.3-no-mp3.patch
raidem-0.3-syslibs.patch raidem-0.3-warn.patch
Log Message:
* Mon May 1 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.1-2
- Fix big finger typo which put the datafiles under /use/share instead
of /usr/share.
raidem-0.3.1-syslibs.patch:
--- NEW FILE raidem-0.3.1-syslibs.patch ---
--- raidem-0.3.1-src/configure.ac.syslibs 2006-04-08 10:48:00.000000000 +0200
+++ raidem-0.3.1-src/configure.ac 2006-04-29 15:01:51.000000000 +0200
@@ -53,7 +53,8 @@
AC_MSG_NOTICE([===== Using lib/adime =====]) &&
(cd lib/adime; sh fix.sh unix --quick) &&
AC_MSG_NOTICE([===== Configured adime =====]),
- AC_MSG_ERROR([cannot find adime])))
+ AC_MSG_ERROR([cannot find adime])),
+ [`$alcfg --libs`])
AC_HAVE_LIBRARY([glyph-alleg],
@@ -104,7 +105,7 @@
#----------------------------------------------------------------
# Optional
-if ! ${alrand}; then
+if [ "$alrand" != "true" ]; then
AC_SUBST(NO_ALRAND, 1)
fi
@@ -120,7 +121,7 @@
if ${ogg}; then
-AC_HAVE_LIBRARY([alogg],
+PKG_CHECK_MODULES(AllegroOGG, [AllegroOGG >= 1.0.0],
AC_SUBST(HAVE_ALLEGROOGG, 1),
AC_CHECK_FILE([lib/allegroogg/Makefile],
AC_MSG_NOTICE([===== Using lib/allegroogg =====]),
--- raidem-0.3.1-src/src/map-editor/map-proc.m.syslibs 2006-01-20 03:33:33.000000000 +0100
+++ raidem-0.3.1-src/src/map-editor/map-proc.m 2006-04-29 15:01:51.000000000 +0200
@@ -4,7 +4,7 @@
#include <allegro.h>
#include <assert.h>
#include <math.h>
-#include "adime/include/adime.h"
+#include <adime.h>
#include "common.h"
#include "group.h"
#include "gui/gui-clip.h"
--- raidem-0.3.1-src/Makefile.cfg.in.syslibs 2006-04-08 07:23:28.000000000 +0200
+++ raidem-0.3.1-src/Makefile.cfg.in 2006-04-29 15:01:51.000000000 +0200
@@ -8,6 +8,7 @@
INSTALL := install
alcfg := @alcfg@
ftcfg := @ftcfg@
+pkgcfg := @PKG_CONFIG@
# Install paths.
prefix := @prefix@
--- raidem-0.3.1-src/Makefile.syslibs 2006-04-08 06:54:03.000000000 +0200
+++ raidem-0.3.1-src/Makefile 2006-04-29 15:13:53.000000000 +0200
@@ -4,8 +4,8 @@
include Makefile.cfg
-CFLAGS += -W -Wall -Werror -Wno-deprecated-declarations \
- -fno-strict-aliasing \
+CFLAGS += -W -Wall -Wno-deprecated-declarations \
+ -fno-strict-aliasing \
-Iinclude -Ilib
#CFLAGS += -g3
--- raidem-0.3.1-src/misc/Makefile.all.syslibs 2006-04-08 09:12:44.000000000 +0200
+++ raidem-0.3.1-src/misc/Makefile.all 2006-04-29 15:01:51.000000000 +0200
@@ -30,7 +30,8 @@
CFLAGS += -DNO_OGG
else
ifdef HAVE_ALLEGROOGG
-LDLIBS += -lalogg
+LDLIBS += `$(pkgcfg) AllegroOGG --libs`
+CFLAGS += `$(pkgcfg) AllegroOGG --cflags`
else
CFLAGS += -Ilib/allegroogg/include
endif # HAVE_ALLEGROOGG
@@ -56,11 +57,14 @@
# Glyph-Keeper
ifdef HAVE_GLYPH_KEEPER
LDLIBS += -lglyph-alleg
+CFLAGS += -DGLYPH_TARGET=GLYPH_TARGET_ALLEGRO
else
CFLAGS += -DGLYPH_TARGET=GLYPH_TARGET_ALLEGRO -Ilib/glyph-keeper/include
endif # HAVE_GLYPH_KEEPER
-ifndef HAVE_FREETYPE
+ifdef HAVE_FREETYPE
+LDLIBS += `$(ftcfg) --libs`
+else
CFLAGS += -Ilib/freetype/include
endif
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/raidem/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 15 Mar 2006 18:43:34 -0000 1.2
+++ .cvsignore 1 May 2006 16:34:18 -0000 1.3
@@ -1 +1 @@
-raidem-0.3-src.zip
+raidem-0.3.1-src.zip
Index: raidem.spec
===================================================================
RCS file: /cvs/extras/rpms/raidem/FC-5/raidem.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- raidem.spec 6 Apr 2006 20:28:50 -0000 1.3
+++ raidem.spec 1 May 2006 16:34:18 -0000 1.4
@@ -1,5 +1,5 @@
Name: raidem
-Version: 0.3
+Version: 0.3.1
Release: 2%{?dist}
Summary: 2d top-down shoot'em up
Group: Amusements/Games
@@ -10,13 +10,11 @@
Source0: %{name}-%{version}-src.zip
Source1: raidem.png
Source2: raidem.desktop
-Patch0: raidem-0.3-no-mp3.patch
-Patch1: raidem-0.3-syslibs.patch
-Patch2: raidem-0.3-warn.patch
-Patch3: raidem-0.3-loadpng.patch
+Patch0: raidem-0.3.1-syslibs.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gcc-objc glyph-keeper-devel freetype-devel adime-devel
-BuildRequires: zziplib-devel libpng-devel desktop-file-utils
+BuildRequires: zziplib-devel libpng-devel libid3tag-devel AllegroOGG-devel
+BuildRequires: automake desktop-file-utils
%description
Raid'em is a 2d top-down shoot'em up. It began as a remake of Raid II
@@ -29,30 +27,27 @@
%prep
%setup -q -n %{name}-%{version}-src
-%patch0 -p1 -z .no_mp3
-%patch1 -p1 -z .syslibs
-%patch2 -p1 -z .warn
-%patch3 -p1 -z .loadpng
+%patch0 -p1 -z .syslibs
# remove all included system libs, to avoid using the included system headers.
mv lib/loadpng .
rm -fr lib/*
mv loadpng lib
+aclocal
+autoconf
%build
-make %{?_smp_mflags} lib/loadpng/libldpng.a raid \
- CFLAGS="$RPM_OPT_FLAGS -fsigned-char -Iinclude -Ilib -D__LINUX__ -DNO_MP3 \
- -DNO_ID3TAGS -DNO_FBLEND -DGLYPH_TARGET=GLYPH_TARGET_ALLEGRO -DITOUCH \
- -DRAIDEM_DATA_DIR=\\\"%{_datadir}/%{name}/\\\"" \
- LDLIBS="-lglyph-alleg `freetype-config --libs` lib/loadpng/libldpng.a -lpng \
- -lzzip -ladime `allegro-config --libs` -lz -lpthread -lobjc"
+# override _datadir otherwise it expects its datafile directly under /use/share
+%configure --datadir=%{_datadir}/%{name}
+make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
-#DIY, since the Makefile uses hardcoded ( := assigned) paths.
+# DIY, since the Makefile uses hardcoded ( := assigned) paths and install -s
+# and install -g games, etc. Fixable but this is easier
mkdir -p $RPM_BUILD_ROOT%{_bindir}
-install -m 755 raid $RPM_BUILD_ROOT%{_bindir}/%{name}
+install -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
cp -a data demos maps $RPM_BUILD_ROOT%{_datadir}/%{name}
@@ -89,11 +84,20 @@
%doc ChangeLog docs/LICENCE.txt docs/README.txt docs/damages.txt
%{_bindir}/%{name}
%{_datadir}/%{name}
-%{_datadir}/applications/fedora-raidem.desktop
-%{_datadir}/icons/hicolor/48x48/apps/raidem.png
+%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%changelog
+* Mon May 1 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.1-2
+- Fix big finger typo which put the datafiles under /use/share instead
+ of /usr/share.
+
+* Sat Apr 29 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.1-1
+- New upstream release 0.3.1
+- Upstream has merged most patches, dropped.
+- Upstream has added ogg support (yeah!), add ogg and id3tag support.
+
* Sun Apr 2 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3-2
- Add missing RPM_OPT_FLAGS to CFLAGS
- Add missing -D__LINUX__ to CFLAGS with this patch2 is no longer needed
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/raidem/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 15 Mar 2006 18:43:34 -0000 1.2
+++ sources 1 May 2006 16:34:18 -0000 1.3
@@ -1 +1 @@
-7a8de682a0fe122e784cc192b19ece4e raidem-0.3-src.zip
+5bb3fa98b43e86afa453f88a8d90bf64 raidem-0.3.1-src.zip
--- raidem-0.3-loadpng.patch DELETED ---
--- raidem-0.3-no-mp3.patch DELETED ---
--- raidem-0.3-syslibs.patch DELETED ---
--- raidem-0.3-warn.patch DELETED ---
More information about the fedora-extras-commits
mailing list