SPECS: fltk.spec - fix for prev. update.

[pluto]

Author: pluto                        Date: Thu Aug 17 08:38:22 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix for prev. update.

---- Files affected:
SPECS:
   fltk.spec (1.52 -> 1.53) 

---- Diffs:

================================================================
Index: SPECS/fltk.spec
diff -u SPECS/fltk.spec:1.52 SPECS/fltk.spec:1.53
--- SPECS/fltk.spec:1.52	Thu Aug 17 09:07:46 2006
+++ SPECS/fltk.spec	Thu Aug 17 10:38:17 2006
@@ -2,7 +2,7 @@
 #
 # Conditional build:
 %bcond_without	gl	# without OpenGL libraries
-%bcond_with	xft	# with Xft support
+%bcond_without	xft	# without Xft support
 #
 Summary:	Fast Light Tool Kit
 Summary(pl):	FLTK - "lekki" X11 toolkit
@@ -19,17 +19,21 @@
 Patch0:		%{name}-link.patch
 Patch1:		%{name}-cxx.patch
 URL:		http://www.fltk.org/
-%{?with_gl:BuildRequires:	OpenGL-devel}
+%{?with_gl:BuildRequires:	OpenGL-GLU-devel}
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	autoconf
 BuildRequires:	libstdc++-devel
-%{?with_xft:BuildRequires:	xft-devel}
+%{?with_xft:BuildRequires:	xorg-lib-libXft-devel}
+BuildRequires:	xorg-util-makedepend
 Obsoletes:	libfltk1.1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_noautoreqdep	libGL.so.1 libGLU.so.1
 
+# don't propagate strip-flags to fltk-config.
+%define		filterout_ld	(-Wl,)?-[sS] (-Wl,)?--strip.*
+
 %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
@@ -126,17 +130,12 @@
 
 %prep
 %setup -q
-#%patch0 -p1
-#%patch1 -p1
+%patch0 -p1
+%patch1 -p1
 
 install %{SOURCE1} .
 
 %build
-CPPFLAGS="-I/usr/X11R6/include"
-CXXFLAGS="%{rpmcflags} -I/usr/include/freetype2"
-# no "-s" in LDFLAGS, they are propagated to fltk-config
-# (together with -L/usr/X11R6/lib, so cannot be removed)
-LDFLAGS=" "
 %{__autoconf}
 %configure \
 	--enable-shared \
@@ -223,6 +222,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.53  2006/08/17 08:38:17  pluto
+- fix for prev. update.
+
 Revision 1.52  2006/08/17 07:07:46  aredridel
 - 1.1.7
 - bcond with xft instead of without
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/fltk.spec?r1=1.52&r2=1.53&f=u