rpms/SoQt/devel SoQt.spec,1.31,1.32

[corsepiu]

Author: corsepiu

Update of /cvs/pkgs/rpms/SoQt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28384/devel

Modified Files:
	SoQt.spec 
Log Message:
* Sun Nov 22 2009 Ralf Corsépius <corsepiu at fedoraproject.org> - 1.4.1-13
- Eliminate stray /usr/share/Coin directory.



Index: SoQt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/SoQt/devel/SoQt.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- SoQt.spec	29 Jul 2009 11:04:15 -0000	1.31
+++ SoQt.spec	22 Nov 2009 04:46:54 -0000	1.32
@@ -4,7 +4,7 @@
 Summary: High-level 3D visualization library
 Name: SoQt
 Version: 1.4.1
-Release: 12%{?dist}
+Release: 13%{?dist}
 
 License: GPLv2
 Group: System Environment/Libraries
@@ -53,6 +53,8 @@ Development package for SoQt
 %patch0 -p1
 %patch1 -p1
 
+find -name 'Makefile.*' -exec sed -i -e 's,\$(datadir)/Coin,$(datadir)/Coin2,' {} \;
+
 # HACK ALERT
 # The sources are ISO-8859-1 encoded
 # We want doxygen to generate utf-8 encoded docs from them
@@ -76,7 +78,7 @@ make
 sed -i -e "s,-L%{_libdir} ,," soqt-default.cfg
 
 # soqt-config is arch dependent
-sed -i -e "s,/share/Coin/conf/,/%{_lib}/Coin2/conf/,g" soqt-config
+sed -i -e "s,/share/Coin2/conf/,/%{_lib}/Coin2/conf/,g" soqt-config
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -84,7 +86,7 @@ make DESTDIR=$RPM_BUILD_ROOT install
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/libSoQt.*a
 
 install -d -m 755 ${RPM_BUILD_ROOT}%{_libdir}/Coin2
-mv ${RPM_BUILD_ROOT}%{_datadir}/Coin/conf ${RPM_BUILD_ROOT}%{_libdir}/Coin2
+mv ${RPM_BUILD_ROOT}%{_datadir}/Coin2/conf ${RPM_BUILD_ROOT}%{_libdir}/Coin2
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -104,14 +106,17 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root)
 %{_bindir}/*
 %{_datadir}/aclocal/soqt.m4
-%{_datadir}/Coin
-%doc %{coin_htmldir}/*
+%dir %{_datadir}/Coin2
+%doc %{coin_htmldir}/SoQt
 %{coin_includedir}/*
 %{_libdir}/libSoQt.so
 %{_libdir}/Coin2
 %{_mandir}/man?/*.?.gz
 
 %changelog
+* Sun Nov 22 2009 Ralf Corsépius <corsepiu at fedoraproject.org> - 1.4.1-13
+- Eliminate stray /usr/share/Coin directory.
+
 * Wed Jul 29 2009 Ralf Corsépius <corsepiu at fedoraproject.org> - 1.4.1-12
 - Switch to qt4.