rpms/raidem/devel raidem-0.3.1-syslibs.patch, 1.2, 1.3 raidem.spec, 1.8, 1.9 needs.rebuild, 1.1, NONE raidem-0.3.1-ft-test.patch, 1.1, NONE
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Mon Aug 28 15:01:04 UTC 2006
- Previous message: rpms/akode/devel akode.spec,1.4,1.5 needs.rebuild,1.1,NONE
- Next message: rpms/k3b-extras/devel .cvsignore, 1.3, 1.4 k3b-extras.spec, 1.4, 1.5 sources, 1.3, 1.4 needs.rebuild, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jwrdegoede
Update of /cvs/extras/rpms/raidem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27816
Modified Files:
raidem-0.3.1-syslibs.patch raidem.spec
Removed Files:
needs.rebuild raidem-0.3.1-ft-test.patch
Log Message:
* Mon Aug 28 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.1-5
- Fix build with new dynamic glyph-keeper lib
- FE6 Rebuild
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- raidem-0.3.1-syslibs.patch 29 Apr 2006 18:56:35 -0000 1.2
+++ raidem-0.3.1-syslibs.patch 28 Aug 2006 15:01:04 -0000 1.3
@@ -1,5 +1,44 @@
+--- 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-08-28 16:48:53.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/misc/Makefile.all.syslibs 2006-04-08 09:12:44.000000000 +0200
++++ raidem-0.3.1-src/misc/Makefile.all 2006-08-28 16:48:53.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
+
--- 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
++++ raidem-0.3.1-src/configure.ac 2006-08-28 16:49:01.000000000 +0200
@@ -53,7 +53,8 @@
AC_MSG_NOTICE([===== Using lib/adime =====]) &&
(cd lib/adime; sh fix.sh unix --quick) &&
@@ -10,7 +49,26 @@
AC_HAVE_LIBRARY([glyph-alleg],
-@@ -104,7 +105,7 @@
+@@ -62,7 +63,8 @@
+ AC_MSG_NOTICE([===== Using lib/glyph-keeper =====]) &&
+ (cd lib/glyph-keeper; cp Makefile.GNU.all Makefile) &&
+ AC_MSG_NOTICE([===== Configured glyph-keeper =====]),
+- AC_MSG_ERROR([cannot file glyph keeper (allegro)])))
++ AC_MSG_ERROR([cannot file glyph keeper (allegro)])),
++ [`$alcfg --libs`])
+
+
+
+@@ -87,7 +89,7 @@
+
+ if test $VER_MAJOR -lt 2 ||
+ test $VER_MINOR -lt 1 ||
+- test $VER_PATCH -lt 10; then
++ test $VER_MINOR -eq 1 -a $VER_PATCH -lt 10; then
+ AC_MSG_NOTICE([installed version of Freetype < 2.1.10]) &&
+ try_local_freetype
+ else
+@@ -104,7 +106,7 @@
#----------------------------------------------------------------
# Optional
@@ -19,7 +77,7 @@
AC_SUBST(NO_ALRAND, 1)
fi
-@@ -120,7 +121,7 @@
+@@ -120,7 +122,7 @@
if ${ogg}; then
@@ -28,19 +86,8 @@
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
++++ raidem-0.3.1-src/Makefile.cfg.in 2006-08-28 16:48:53.000000000 +0200
@@ -8,6 +8,7 @@
INSTALL := install
alcfg := @alcfg@
@@ -50,7 +97,7 @@
# 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
++++ raidem-0.3.1-src/Makefile 2006-08-28 16:48:53.000000000 +0200
@@ -4,8 +4,8 @@
include Makefile.cfg
@@ -62,31 +109,3 @@
-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: raidem.spec
===================================================================
RCS file: /cvs/extras/rpms/raidem/devel/raidem.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- raidem.spec 18 Jul 2006 17:37:02 -0000 1.8
+++ raidem.spec 28 Aug 2006 15:01:04 -0000 1.9
@@ -1,6 +1,6 @@
Name: raidem
Version: 0.3.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: 2d top-down shoot'em up
Group: Amusements/Games
License: zlib License
@@ -11,7 +11,6 @@
Source1: raidem.png
Source2: raidem.desktop
Patch0: raidem-0.3.1-syslibs.patch
-Patch1: raidem-0.3.1-ft-test.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 libid3tag-devel AllegroOGG-devel
@@ -29,7 +28,6 @@
%prep
%setup -q -n %{name}-%{version}-src
%patch0 -p1 -z .syslibs
-%patch1 -p1 -z .ft-test
# remove all included system libs, to avoid using the included system headers.
mv lib/loadpng .
rm -fr lib/*
@@ -91,6 +89,10 @@
%changelog
+* Mon Aug 28 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.1-5
+- Fix build with new dynamic glyph-keeper lib
+- FE6 Rebuild
+
* Tue Jul 18 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.1-4
- Fix building (configure test) with freetype 2.2.x .
--- needs.rebuild DELETED ---
--- raidem-0.3.1-ft-test.patch DELETED ---
- Previous message: rpms/akode/devel akode.spec,1.4,1.5 needs.rebuild,1.1,NONE
- Next message: rpms/k3b-extras/devel .cvsignore, 1.3, 1.4 k3b-extras.spec, 1.4, 1.5 sources, 1.3, 1.4 needs.rebuild, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list