rpms/Coin2/devel Coin2.spec,1.17,1.18

[Ralf Corsépius (corsepiu)]

Author: corsepiu

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

Modified Files:
	Coin2.spec 
Log Message:
- Remove simacros patch.
- Remove libtool patch.
- Link against freetype2.



Index: Coin2.spec
===================================================================
RCS file: /cvs/extras/rpms/Coin2/devel/Coin2.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Coin2.spec	21 Sep 2005 14:26:31 -0000	1.17
+++ Coin2.spec	22 Sep 2005 03:06:09 -0000	1.18
@@ -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.4
-Release: 1.1%{?dist}
+Release: 2%{?dist}
 
 License: GPL
 Group: System Environment/Libraries
@@ -24,9 +23,6 @@
 
 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
@@ -42,9 +38,6 @@
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
-# TESTING
-ExclusiveArch: x86_64
-
 %description
 Coin is a 3D graphics library with an Application Programming Interface
 based on the Open Inventor 2.1 API.
@@ -62,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}",' \
@@ -93,14 +81,11 @@
 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
@@ -127,6 +112,11 @@
 %doc %{coin_htmldir}
 
 %changelog
+* Thu Sep 22 2005 Ralf Corsepius <ralf at links2linux.de> - 2.4.4-2
+- 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.