rpms/raidem/devel raidem-0.3.1-ft-test.patch, NONE, 1.1 raidem.spec, 1.7, 1.8

Hans de Goede (jwrdegoede) fedora-extras-commits at redhat.com
Tue Jul 18 17:37:03 UTC 2006


Author: jwrdegoede

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

Modified Files:
	raidem.spec 
Added Files:
	raidem-0.3.1-ft-test.patch 
Log Message:
* 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 .


raidem-0.3.1-ft-test.patch:

--- NEW FILE raidem-0.3.1-ft-test.patch ---
--- raidem-0.3.1-src/configure.ac~	2006-07-18 19:31:30.000000000 +0200
+++ raidem-0.3.1-src/configure.ac	2006-07-18 19:31:30.000000000 +0200
@@ -88,7 +88,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
--- raidem-0.3.1-src/configure~	2006-07-18 19:31:33.000000000 +0200
+++ raidem-0.3.1-src/configure	2006-07-18 19:31:33.000000000 +0200
@@ -2888,7 +2888,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
       { echo "$as_me:$LINENO: installed version of Freetype < 2.1.10" >&5
 echo "$as_me: installed version of Freetype < 2.1.10" >&6;} &&
       try_local_freetype


Index: raidem.spec
===================================================================
RCS file: /cvs/extras/rpms/raidem/devel/raidem.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- raidem.spec	6 Jul 2006 19:00:06 -0000	1.7
+++ raidem.spec	18 Jul 2006 17:37:02 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           raidem
 Version:        0.3.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        2d top-down shoot'em up
 Group:          Amusements/Games
 License:        zlib License
@@ -11,6 +11,7 @@
 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
@@ -28,6 +29,7 @@
 %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/*
@@ -89,6 +91,9 @@
 
 
 %changelog
+* 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 .
+
 * Thu Jul  6 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.1-3
 - Rebuild against new allegro to remove executable stack requirement caused
   by previous versions of allegro.




More information about the fedora-extras-commits mailing list