rpms/Coin2/devel Coin2.spec,1.14,1.15

[Ralf Corsépius (corsepiu)]

Author: corsepiu

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

Modified Files:
	Coin2.spec 
Log Message:
More testing


Index: Coin2.spec
===================================================================
RCS file: /cvs/extras/rpms/Coin2/devel/Coin2.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Coin2.spec	20 Sep 2005 09:23:05 -0000	1.14
+++ Coin2.spec	20 Sep 2005 12:26:01 -0000	1.15
@@ -9,7 +9,7 @@
 
 %define libopenal_SONAME libopenal.so.0
 %define libsimage_SONAME libsimage.so.20
-%define libfreetype_SONAME libfreetype.so.6
+# %define libfreetype_SONAME libfreetype.so.6
 
 Summary: High-level 3D visualization library
 Name: Coin2
@@ -32,7 +32,10 @@
 BuildRequires: xorg-x11-Mesa-libGL
 BuildRequires: xorg-x11-Mesa-libGLU
 BuildRequires: xorg-x11-devel
-BuildRequires: zlib-devel bzip2-devel
+BuildRequires: zlib-devel
+BuildRequires: bzip2-devel
+# BuildRequires: fontconfig-devel
+# BuildRequries: freetype-devel
 BuildRequires: doxygen
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -59,13 +62,13 @@
 %setup -q -n Coin-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+# %patch2 -p1
 # %patch3 -p1
 # %patch4 -p1
 %patch5 -p1
 
-sed -i -e 's, at LIBFREETYPE_SONAME@,"%{libfreetype_SONAME}",' \
-  src/glue/freetype.c
+# sed -i -e 's, at LIBFREETYPE_SONAME@,"%{libfreetype_SONAME}",' \
+#  src/glue/freetype.c
 sed -i -e 's, at LIBSIMAGE_SONAME@,"%{libsimage_SONAME}",' \
   src/glue/simage_wrapper.c
 sed -i -e 's, at LIBOPENAL_SONAME@,"%{libopenal_SONAME}",' \
@@ -79,10 +82,14 @@
 	--disable-dl-libbzip2 \
 	--disable-dl-glu \
 	--disable-dl-zlib \
+	--disable-dl-freetype \
+	--disable-dl-fontconfig \
+	--disable-spidermonkey \
 	--enable-man \
 	--enable-html \
 	--enable-3ds-import \
-	htmldir=%{coin_htmldir}/Coin
+	htmldir=%{coin_htmldir}/Coin \
+	CFLAGS="$RPM_OPT_FLAGS "$(pkg-config --cflags freetype2)
 make %{?_smp_mflags}
 
 %install