[SoQt] Modernize spec.

[corsepiu]

commit fefcb4c7495729d36db133263616ed7ce6708f5a
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Sun Mar 11 09:43:56 2012 +0100

    Modernize spec.
    
    - Filter CFLAGS/LDFLAGS clutter in *.pc, *.cfg.
    - Pass x_includes=" " x_libraries=" " to %configure to work-around RHBZ #801369.
    - Don't add build-time to doxygen generated docs (Add SoQt-1.5.0-doxgen.diff).

 SoQt-1.5.0-doxygen.diff |   11 +++++++++++
 SoQt.spec               |   28 +++++++++++++++++++---------
 2 files changed, 30 insertions(+), 9 deletions(-)
---
diff --git a/SoQt-1.5.0-doxygen.diff b/SoQt-1.5.0-doxygen.diff
new file mode 100644
index 0000000..1638ce5
--- /dev/null
+++ b/SoQt-1.5.0-doxygen.diff
@@ -0,0 +1,11 @@
+diff -Naur SoQt-1.5.0.orig/src/Inventor/Qt/common/docs/doxygen/footer.html SoQt-1.5.0/src/Inventor/Qt/common/docs/doxygen/footer.html
+--- SoQt-1.5.0.orig/src/Inventor/Qt/common/docs/doxygen/footer.html	2010-03-02 23:04:52.000000000 +0100
++++ SoQt-1.5.0/src/Inventor/Qt/common/docs/doxygen/footer.html	2012-03-11 08:23:06.814101287 +0100
+@@ -1,6 +1,6 @@
+ <hr noshade>
+ <p align="right">Copyright &copy 1998-2010 by <a href="http://http://www.kongsberg.com/kogt">Kongsberg Oil & Gas Technologies</a>. All rights reserved.</p>
+ <address style="align: right;"><small>
+-Generated on $datetime for $projectname by <a href="http://www.doxygen.org/">Doxygen</a> $doxygenversion.</small></address>
++Generated on $date for $projectname by <a href="http://www.doxygen.org/">Doxygen</a> $doxygenversion.</small></address>
+ </body>
+ </html>
diff --git a/SoQt.spec b/SoQt.spec
index 076bbaf..75a68b9 100644
--- a/SoQt.spec
+++ b/SoQt.spec
@@ -4,7 +4,7 @@
 Summary: High-level 3D visualization library
 Name: SoQt
 Version: 1.5.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 Group: System Environment/Libraries
@@ -13,6 +13,7 @@ URL: http://www.coin3d.org
 Source: http://ftp.coin3d.org/coin/src/all/SoQt-%{version}.tar.gz
 
 Patch0: SoQt-1.2.0-man3.diff
+Patch1: SoQt-1.5.0-doxygen.diff
 
 BuildRequires: doxygen
 BuildRequires: /usr/bin/iconv
@@ -25,8 +26,6 @@ Provides: Coin2-SoQt = %{version}-%{release}
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 %description
 SoQt is a Qt GUI component toolkit library for Coin.  It is also compatible
 with SGI and TGS Open Inventor, and the API is based on the API of the
@@ -49,6 +48,7 @@ Development package for SoQt
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 find -name 'Makefile.*' -exec sed -i -e 's,\$(datadir)/Coin,$(datadir)/Coin2,' {} \;
 
@@ -70,26 +70,30 @@ sed -i \
 	--with-qt=%{_libdir}/qt4 \
 	htmldir=%{coin_htmldir}/SoQt \
 	CPPFLAGS="${CPPFLAGS} -I%{_includedir}/Qt" \
-	CONFIG_QTLIBS="$(pkg-config --libs QtGui)"
+	CONFIG_QTLIBS="$(pkg-config --libs QtGui)" \
+	x_includes=" " x_libraries=" "
 make
 
 # Strip the default libdir
-sed -i -e "s,-L%{_libdir} ,," soqt-default.cfg
+sed -i -e "s,-L%{_libdir} ,,g" soqt-default.cfg
+
+# Strip ${RPM_OPT_FLAGS}
+sed -i -e "s|${RPM_OPT_FLAGS}||g" soqt-default.cfg SoQt.pc
+
+# Strip ${LDFLAGS}
+ldflags=$(echo "$LDFLAGS"| sed -e 's|^\s*||;s|\s*$||')
+sed -i -e "s|${ldflags}||g" soqt-default.cfg SoQt.pc
 
 # soqt-config is arch dependent
 sed -i -e "s,/share/Coin/conf/,/%{_lib}/Coin2/conf/,g" soqt-config
 
 %install
-rm -rf $RPM_BUILD_ROOT
 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}/Coin2/conf ${RPM_BUILD_ROOT}%{_libdir}/Coin2
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
 /sbin/ldconfig
 
@@ -114,6 +118,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/SoQt.pc
 
 %changelog
+* Sun Mar 11 2012 Ralf Corsépius <corsepiu at fedoraproject.org> - 1.5.0-4
+- Modernize spec.
+- Filter CFLAGS/LDFLAGS clutter in *.pc, *.cfg.
+- Pass x_includes=" " x_libraries=" " to %configure to work-around RHBZ #801369.
+- Don't add build-time to doxygen generated docs (Add SoQt-1.5.0-doxgen.diff).
+
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild