- fixed OpenGL detection, added bcond to disable GL support

Changed files:
    fltk-fluid-shared.patch -> 1.2
    fltk.spec -> 1.31

diff --git a/fltk-fluid-shared.patch b/fltk-fluid-shared.patch
index 2f506fcee9b2dbf1d5f9db30d097a9d7390cfe54..41cd2746267026f4e32f59b13dbbbda9d37e3a5b 100644 (file)
--- a/fltk-fluid-shared.patch
+++ b/fltk-fluid-shared.patch
@@ -8,3 +8,14 @@
        $(CXX) -L../lib $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) -lfltk $(LDLIBS)
  
  clean :
+--- fltk-1.0.11/src/Makefile.orig      Mon Jan 22 16:13:40 2001
++++ fltk-1.0.11/src/Makefile   Fri May 24 17:49:24 2002
+@@ -161,7 +161,7 @@
+ 
+ libfltk.so.1 libfltk.sl.1: $(OBJECTS)
+       echo $(DSOCOMMAND) $@ ...
+-      $(DSOCOMMAND) $@ $(OBJECTS)
++      $(DSOCOMMAND) $@ $(OBJECTS) $(GLDLIBS)
+ 
+ clean :
+       -@ rm -f *.o *.do $(DSONAME) $(LIBRARY) $(CLEAN) core *~ ../include/*~ makedepend cmap

diff --git a/fltk.spec b/fltk.spec
index 3040cc9cd4f60d2c5353b61c2584745321566433..1f13b71fe30e44aff06cd3f21cd9b4ceb7c3a906 100644 (file)
--- a/fltk.spec
+++ b/fltk.spec
@@ -1,3 +1,7 @@
+#
+# Conditional build:
+# _without_gl  - without OpenGL support
+#
 Summary:       Fast Light Tool Kit
 Summary(pl):   FLTK - "lekki" X11 toolkit
 Summary(pt_BR):        Interface gráfica em C++ para X, OpenGL e Windows
@@ -10,14 +14,18 @@ Source0:    ftp://ftp.easysw.com/pub/%{name}/%{version}/%{name}-%{version}-source.t
 Source1:       http://www.fltk.org/doc/%{name}.ps.gz
 Patch0:                %{name}-fluid-shared.patch
 URL:           http://www.fltk.org/
+%{!?_without_gl:BuildRequires: OpenGL-devel}
 BuildRequires: XFree86-devel >= 3.3.6
 BuildRequires: gcc-c++
-Buildroot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%{!?_without_gl:Requires: OpenGL}
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     libfltk1.1
 
 %define                _prefix         /usr/X11R6
 %define                _mandir         %{_prefix}/man
 
+%define                _noautoreqdep   libGL.so.1 libGLU.so.1
+
 %description
 The Fast Light Tool Kit ("FLTK", pronounced "fulltick") is a LGPL'd
 C++ graphical user interface toolkit for X (UNIX(r)), OpenGL(r), and
@@ -79,12 +87,14 @@ Bibliotecas est
 install %{SOURCE1} .
 
 %build
+CPPFLAGS="-I/usr/X11R6/include"; export CPPFLAGS
 %configure2_13 \
        --libdir=$RPM_BUILD_ROOT%{_libdir} \
        --includedir=$RPM_BUILD_ROOT%{_includedir} \
        --bindir=$RPM_BUILD_ROOT%{_bindir} \
        --enable-shared \
-       --with-x
+       --with-x \
+       %{?_without_gl:--disable-gl}
 
 %{__make} depend
 %{__make}