rpms/raidem/devel .cvsignore, 1.2, 1.3 raidem-0.3.1-syslibs.patch, 1.1, 1.2 raidem.spec, 1.4, 1.5 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
Sat Apr 29 18:56:35 UTC 2006


Author: jwrdegoede

Update of /cvs/extras/rpms/raidem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17298

Modified Files:
	.cvsignore raidem-0.3.1-syslibs.patch raidem.spec sources 
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:
* 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.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/raidem/devel/.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	29 Apr 2006 18:56:35 -0000	1.3
@@ -1 +1 @@
-raidem-0.3-src.zip
+raidem-0.3.1-src.zip

raidem-0.3.1-syslibs.patch:

Index: raidem-0.3.1-syslibs.patch
===================================================================
RCS file: /cvs/extras/rpms/raidem/devel/raidem-0.3.1-syslibs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- raidem-0.3.1-syslibs.patch	11 Apr 2006 20:46:48 -0000	1.1
+++ raidem-0.3.1-syslibs.patch	29 Apr 2006 18:56:35 -0000	1.2
@@ -1,20 +1,5 @@
-diff -ur raidem-0.3.1-src.orig/Makefile raidem-0.3.1-src/Makefile
---- raidem-0.3.1-src.orig/Makefile	2006-04-08 06:54:03.000000000 +0200
-+++ raidem-0.3.1-src/Makefile	2006-04-09 20:46:18.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
- 
-diff -ur raidem-0.3.1-src.orig/configure.ac raidem-0.3.1-src/configure.ac
---- raidem-0.3.1-src.orig/configure.ac	2006-04-08 10:48:00.000000000 +0200
-+++ raidem-0.3.1-src/configure.ac	2006-04-11 22:06:03.000000000 +0200
+--- 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) &&
@@ -34,20 +19,62 @@
  AC_SUBST(NO_ALRAND, 1)
  fi
  
-@@ -124,7 +125,8 @@
+@@ -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 =====]),
--                              AC_SUBST(NO_OGG, 1)))
-+                              AC_SUBST(NO_OGG, 1)),
-+                [`$alcfg --libs`])
+--- 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
- AC_SUBST(NO_OGG, 1)
- fi
-diff -ur raidem-0.3.1-src.orig/misc/Makefile.all raidem-0.3.1-src/misc/Makefile.all
---- raidem-0.3.1-src.orig/misc/Makefile.all	2006-04-08 09:12:44.000000000 +0200
-+++ raidem-0.3.1-src/misc/Makefile.all	2006-04-09 21:06:03.000000000 +0200
-@@ -56,11 +56,14 @@
+ 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
@@ -63,15 +90,3 @@
  CFLAGS += -Ilib/freetype/include
  endif
  
-diff -ur raidem-0.3.1-src.orig/src/map-editor/map-proc.m raidem-0.3.1-src/src/map-editor/map-proc.m
---- raidem-0.3.1-src.orig/src/map-editor/map-proc.m	2006-01-20 03:33:33.000000000 +0100
-+++ raidem-0.3.1-src/src/map-editor/map-proc.m	2006-04-09 20:47:00.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"


Index: raidem.spec
===================================================================
RCS file: /cvs/extras/rpms/raidem/devel/raidem.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- raidem.spec	6 Apr 2006 20:26:44 -0000	1.4
+++ raidem.spec	29 Apr 2006 18:56:35 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           raidem
-Version:        0.3
-Release:        2%{?dist}
+Version:        0.3.1
+Release:        1%{?dist}
 Summary:        2d top-down shoot'em up
 Group:          Amusements/Games
 License:        zlib License
@@ -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,29 @@
 
 %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
+%define _datadir /usr/share/%{name}
+%configure
+%define _datadir /use/share
+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 +86,16 @@
 %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
+* 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/devel/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	29 Apr 2006 18:56:35 -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