rpms/Coin2/FC-4 sources,1.6,1.7 Coin2.spec,1.12,1.13

[Ralf Corsépius (corsepiu)]

Author: corsepiu

Update of /cvs/extras/rpms/Coin2/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32195

Modified Files:
	sources Coin2.spec 
Log Message:
Update to 2.4.4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Coin2/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	13 Jul 2005 10:42:32 -0000	1.6
+++ sources	22 Sep 2005 07:03:14 -0000	1.7
@@ -1,3 +1,4 @@
 e2dcc9dde9d97577d211f3caba10c7e0  Coin-2.4.3-libtool.diff.bz2
 4f4d4e4172db2107c578d0d99fde2888  Coin-2.4.3-simacros.diff.bz2
 57c039a55133c5037ebef6759d26f603  Coin-2.4.3.tar.gz
+7976fcf2d1154bc8574d75b99bab45ee  Coin-2.4.4.tar.gz


Index: Coin2.spec
===================================================================
RCS file: /cvs/extras/rpms/Coin2/FC-4/Coin2.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Coin2.spec	13 Jul 2005 10:42:32 -0000	1.12
+++ Coin2.spec	22 Sep 2005 07:03:14 -0000	1.13
@@ -9,12 +9,11 @@
 
 %define libopenal_SONAME libopenal.so.0
 %define libsimage_SONAME libsimage.so.20
-%define libfreetype_SONAME libfreetype.so.6
 
 Summary: High-level 3D visualization library
 Name: Coin2
-Version: 2.4.3
-Release: 1%{?dist}
+Version: 2.4.4
+Release: 2%{?dist}
 
 License: GPL
 Group: System Environment/Libraries
@@ -24,15 +23,15 @@
 
 Patch0: coin-2.3.0-simage-soname.diff
 Patch1: coin-2.3.0-openal-soname.diff
-Patch2: coin-2.3.0-freetype-soname.diff
-Patch3: Coin-2.4.3-simacros.diff.bz2
-Patch4: Coin-2.4.3-libtool.diff.bz2
 Patch5: coin-2.3.0-man3.diff
 
 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
+BuildRequires: freetype-devel
 BuildRequires: doxygen
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -56,13 +55,8 @@
 %setup -q -n Coin-%{version}
 %patch0 -p1
 %patch1 -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 LIBSIMAGE_SONAME@,"%{libsimage_SONAME}",' \
   src/glue/simage_wrapper.c
 sed -i -e 's, at LIBOPENAL_SONAME@,"%{libopenal_SONAME}",' \
@@ -76,18 +70,24 @@
 	--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 \
+	CPPFLAGS=$(pkg-config --cflags freetype2)
 make %{?_smp_mflags}
 
 %install
-   rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
+# TESTING
+exit 1
 
 %clean
-   rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
@@ -114,6 +114,14 @@
 %doc %{coin_htmldir}
 
 %changelog
+* Thu Sep 22 2005 Ralf Corsepius <ralf at links2linux.de> - 2.4.4-3
+- Remove simacros patch.
+- Remove libtool patch.
+- Link against freetype2.
+
+* Tue Sep 20 2005 Ralf Corsepius <ralf at links2linux.de> - 2.4.4-1
+- Upstream update.
+
 * Thu Jul 07 2005 Ralf Corsepius <ralf at links2linux.de> - 0:2.4.3-1
 - Upstream update.