rpms/Coin2/FC-5 Coin2.spec,1.31,1.32

[Ralf Corsépius (corsepiu)]

Author: corsepiu

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

Modified Files:
	Coin2.spec 
Log Message:
* Tue Feb 20 2007 Ralf Corsépius <rc040203 at freenet.de> - 2.4.5-5
- Install coin-default.cfg into %{_prefix}/%{_lib}



Index: Coin2.spec
===================================================================
RCS file: /cvs/extras/rpms/Coin2/FC-5/Coin2.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- Coin2.spec	16 Sep 2006 03:25:12 -0000	1.31
+++ Coin2.spec	21 Feb 2007 06:50:05 -0000	1.32
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2005, 2006 Ralf Corsepius, Ulm, Germany.
+# Copyright (c) 2004, 2005, 2006, 2007 Ralf Corsepius, Ulm, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -13,7 +13,7 @@
 Summary: High-level 3D visualization library
 Name: Coin2
 Version: 2.4.5
-Release: 3%{?dist}
+Release: 5%{?dist}
 
 License: GPL
 Group: System Environment/Libraries
@@ -91,10 +91,20 @@
 	CPPFLAGS=$(pkg-config --cflags freetype2)
 make %{?_smp_mflags}
 
+# Strip the default libdir
+sed -i -e "s,\-L%{_libdir} ,," coin-default.cfg
+
+# coin-config is arch dependent
+sed -i -e "s,/share/Coin/conf/,/%{_lib}/Coin2/conf/,g" bin/coin-config
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 /usr/bin/rename .3 .3sim $RPM_BUILD_ROOT%{_mandir}/man3/*
+rm -f ${RPM_BUILD_ROOT}%{_libdir}/lib*.la
+
+install -d -m 755 ${RPM_BUILD_ROOT}%{_prefix}/%{_lib}/Coin2
+mv ${RPM_BUILD_ROOT}%{_datadir}/Coin/conf ${RPM_BUILD_ROOT}%{_prefix}/%{_lib}/Coin2
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -114,16 +124,22 @@
 %defattr(-,root,root,-)
 %{_bindir}/*
 %{coin_includedir}
-%{_libdir}/libCoin.*a
 %{_libdir}/libCoin.so
 %{_datadir}/aclocal/coin.m4
 %dir %{_datadir}/Coin
-%{_datadir}/Coin/conf
+%{_libdir}/Coin2
 %{_datadir}/Coin/draggerDefaults
 %{_mandir}/man?/*
 %doc %{coin_htmldir}
 
 %changelog
+* Tue Feb 20 2007 Ralf Corsépius <rc040203 at freenet.de> - 2.4.5-5
+- Install coin-default.cfg into %%{_prefix}/%%{_lib}
+
+* Mon Feb 19 2007 Ralf Corsépius <rc040203 at freenet.de> - 2.4.5-4
+- Filter errant -L%%_libdir from coin-config.cfg.
+- Remove *.la.
+
 * Fri Sep 15 2006 Ralf Corsépius <rc040203 at freenet.de> - 2.4.5-3
 - Add doxygen hack.