rpms/raidem/devel raidem.spec, 1.2, 1.3 raidem-0.3-datapath.patch, 1.1, NONE

Hans de Goede (jwrdegoede) fedora-extras-commits at redhat.com
Mon Jun 19 17:38:56 UTC 2006


Author: jwrdegoede

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

Modified Files:
	raidem.spec 
Removed Files:
	raidem-0.3-datapath.patch 
Log Message:
* Sun Apr  2 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3-unreleased
- Add missing RPM_OPT_FLAGS to CFLAGS
- Add missing -D__LINUX__ to CFLAGS with this patch2 is no longer needed



Index: raidem.spec
===================================================================
RCS file: /cvs/extras/rpms/raidem/devel/raidem.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- raidem.spec	15 Mar 2006 19:28:21 -0000	1.2
+++ raidem.spec	6 Apr 2006 11:53:48 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           raidem
 Version:        0.3
-Release:        1%{?dist}
+Release:        unreleased(to become 2)%{?dist}
 Summary:        2d top-down shoot'em up
 Group:          Amusements/Games
 License:        zlib License
@@ -12,8 +12,7 @@
 Source2:        raidem.desktop
 Patch0:         raidem-0.3-no-mp3.patch
 Patch1:         raidem-0.3-syslibs.patch
-Patch2:         raidem-0.3-datapath.patch
-Patch3:         raidem-0.3-warn.patch
+Patch2:         raidem-0.3-warn.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
@@ -31,8 +30,7 @@
 %setup -q -n %{name}-%{version}-src
 %patch0 -p1 -z .no_mp3
 %patch1 -p1 -z .syslibs
-%patch2 -p1 -z .datapath
-%patch3 -p1 -z .warn
+%patch2 -p1 -z .warn
 # remove all included system libs, to avoid using the included system headers.
 mv lib/loadpng .
 rm -fr lib/*
@@ -41,8 +39,8 @@
 
 %build
 make %{?_smp_mflags} lib/loadpng/libldpng.a raid \
-  CFLAGS="-Iinclude -Ilib -DNO_MP3 -DNO_ID3TAGS -DNO_FBLEND \
-    -DGLYPH_TARGET=GLYPH_TARGET_ALLEGRO -DITOUCH \
+  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"
@@ -94,5 +92,9 @@
 
 
 %changelog
+* Sun Apr  2 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3-unreleased
+- Add missing RPM_OPT_FLAGS to CFLAGS
+- Add missing -D__LINUX__ to CFLAGS with this patch2 is no longer needed
+
 * Sat Mar 12 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3-1
 - Initial Fedora Extras package


--- raidem-0.3-datapath.patch DELETED ---




More information about the fedora-extras-commits mailing list