rpms/Coin2/FC-3 .cvsignore, 1.6, 1.7 Coin2.spec, 1.9, 1.10 sources, 1.6, 1.7

Wed May 31 04:39:49 UTC 2006

Author: corsepiu

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

Modified Files:
	.cvsignore Coin2.spec sources 
Log Message:
* Tue May 30 2006 Ralf CorsÃ©pius <rc040203 at freenet.de> - 2.4.5-1
- Upstream update.
- Drop gcc-4.1 patch.
- Spec file cleanup.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Coin2/FC-3/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7

--- .cvsignore	1 Aug 2005 08:46:48 -0000	1.6
+++ .cvsignore	31 May 2006 04:39:49 -0000	1.7
@@ -1,3 +1 @@
-Coin-2.4.3-libtool.diff.bz2
-Coin-2.4.3-simacros.diff.bz2
-Coin-2.4.3.tar.gz
+Coin-2.4.5.tar.gz


Index: Coin2.spec
===================================================================
RCS file: /cvs/extras/rpms/Coin2/FC-3/Coin2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Coin2.spec	1 Aug 2005 08:46:48 -0000	1.9
+++ Coin2.spec	31 May 2006 04:39:49 -0000	1.10
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2005 Ralf Corsepius, Ulm, Germany.
+# Copyright (c) 2004, 2005, 2006 Ralf Corsepius, Ulm, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -9,11 +9,10 @@
 
 %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
+Version: 2.4.5
 Release: 1%{?dist}
 
 License: GPL
@@ -24,16 +23,17 @@
 
 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
+BuildRequires: /usr/bin/rename
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post): /sbin/ldconfig
@@ -56,13 +56,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 +71,23 @@
 	--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
+/usr/bin/rename .3 .3sim $RPM_BUILD_ROOT%{_mandir}/man3/*
 
 %clean
-   rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
@@ -114,43 +114,28 @@
 %doc %{coin_htmldir}
 
 %changelog
+* Tue May 30 2006 Ralf CorsÃ©pius <rc040203 at freenet.de> - 2.4.5-1
+- Upstream update.
+- Drop gcc-4.1 patch.
+- Spec file cleanup.
+
+* Wed Feb 22 2006 Ralf CorsÃ©pius <rc040203 at freenet.de> - 2.4.4-3.2
+- Rename man3 manpages to .3sim (PR 182212).
+
+* Thu Sep 22 2005 Ralf CorsÃ©pius <rc040203 at freenet.de> - 2.4.4-3.1
+- Add Coin-2.4.4-gcc-4.1.diff.
+- Remove ancient changelog entries from spec file.
+
+* 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.
 
 * Wed May 17 2005 Ralf Corsepius <ralf at links2linux.de> - 0:2.4.1-1
 - Upstream update.
-
-* Tue May 10 2005 Ralf Corsepius <ralf at links2linux.de> - 0:2.3.0-9
-- Introduce %%{coin_includedir} %%{coin_htmldir}.
-- Misc. spec cleanup.
-
-* Fri May 06 2005 Ralf Corsepius <ralf at links2linux.de> - 0:2.3.0-8
-- Use BR: xorg-x11-* instead of *.so.1 to work around rpm's brain-dead
-  SONAME handling.
-
-* Tue May 03 2005 Ralf Corsepius <ralf at links2linux.de> - 0:2.3.0-7
-- Minor spec changes.
-
-* Tue Feb 22  2005 Ralf Corsepius <ralf at links2linux.de> - 0:2.3.0-5
-- Include simacros.
-- Regenerate configure from simacros and FC3 libtool for x86_64.
-- Don't install bogusly generated manpages for dirs.
-
-* Sun Jul 4  2004 Ralf Corsepius <ralf at links2linux.de> - 0:2.3.0-0.fdr.4
-- Let Coin-devel Require: bzip2-devel, zlib-devel.
-- Use @XX@ patterns in soname sed calls.
-- Remove Mesa from BuildRequires.
-
-* Sat Jul 3  2004 Ralf Corsepius <ralf at links2linux.de> - 0:2.3.0-0.fdr.3
-- Disable run-time linkage for GLU, bzip2, zlib.
-- Add SONAME-hacks to simage, openal, freetype.
-- Enable static libs.
-
-* Fri Jun 25 2004 Ralf Corsepius <ralf at links2linux.de> - 0:2.3.0-0.fdr.2
-- Fix package description.
-- Initial submission to Fedora Extra.
-
-* Thu Jun 24 2004 Ralf Corsepius <ralf at links2linux.de> - 0:2.3.0-0.fdr.1
-- Update to 2.3.0
-- Install html docs to default installation dir (%%{_datadir}/html).
-- Remove dependency to simage.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Coin2/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Aug 2005 08:46:48 -0000	1.6
+++ sources	31 May 2006 04:39:49 -0000	1.7
@@ -1,3 +1 @@
-e2dcc9dde9d97577d211f3caba10c7e0  Coin-2.4.3-libtool.diff.bz2
-4f4d4e4172db2107c578d0d99fde2888  Coin-2.4.3-simacros.diff.bz2
-57c039a55133c5037ebef6759d26f603  Coin-2.4.3.tar.gz
+99b83c5189c3755fd5f08fcad0994a7b  Coin-2.4.5.tar.gz


