- fixed x86_64 build by disabling most autocrap (autoconf/libtoolize pair

[packages/OGLFT.git] / OGLFT.spec

diff --git a/OGLFT.spec b/OGLFT.spec
index 7dc5de675eb4de0735c7cbef4821ba35ed4d3cb6..c366098ef802c5141bae2fb7c3a48d745b91dbe7 100644 (file)
--- a/OGLFT.spec
+++ b/OGLFT.spec
@@ -1,7 +1,7 @@
 Summary:       OpenGL-FreeType Library
 Name:          OGLFT
 Version:       0.9
-Release:       1
+Release:       3
 License:       LGPL
 Group:         Libraries
 Source0:       http://downloads.sourceforge.net/oglft/oglft-%{version}.tar.gz
@@ -12,6 +12,7 @@ BuildRequires:        automake
 BuildRequires: freetype-devel
 BuildRequires: gle-devel
 BuildRequires: libtool
+BuildRequires: qt-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -40,11 +41,17 @@ Static version of OGLFT.
 %setup -q -n oglft-%{version}
 
 %build
+QTDIR=/usr
+CPPFLAGS=-I/usr/include/qt
+export QTDIR CPPFLAGS
 %{__aclocal}
-%{__autoconf}
+# autoconf requires libtoolize, otherwise causes endless libtool loop
+#%%{__autoconf}
 %{__autoheader}
-%{__automake}
-%{__libtoolize}
+# automake requires aclocal and autoconf
+#%%{__automake}
+# libtoolize requires autoconf, otherwise ../libtool[400]: CDPATH: not found
+#%%{__libtoolize}
 %configure
 %{__make}
 
@@ -54,6 +61,8 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libOGLFT.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -68,7 +77,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc doc/html
 %{_includedir}/oglft
 %attr(755,root,root) %{_libdir}/libOGLFT.so
-%{_libdir}/libOGLFT.la
 
 %files static
 %defattr(644,root,root,755)