SPECS: fox.spec - switched to modular xorg, enabled xft - release 2

[qboosh]

Author: qboosh                       Date: Sun Apr  2 18:18:38 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- switched to modular xorg, enabled xft
- release 2

---- Files affected:
SPECS:
   fox.spec (1.84 -> 1.85) 

---- Diffs:

================================================================
Index: SPECS/fox.spec
diff -u SPECS/fox.spec:1.84 SPECS/fox.spec:1.85
--- SPECS/fox.spec:1.84	Tue Mar 21 22:02:37 2006
+++ SPECS/fox.spec	Sun Apr  2 20:18:33 2006
@@ -7,7 +7,7 @@
 Summary(pl):	FOX - toolkit graficzny w C++
 Name:		fox
 Version:	1.6.0
-Release:	1
+Release:	2
 License:	LGPL
 Group:		X11/Libraries
 Source0:	ftp://ftp.fox-toolkit.com/pub/%{name}-%{version}.tar.gz
@@ -16,16 +16,20 @@
 Patch1:		%{name}-link.patch
 Patch2:		%{name}-Makefile.patch
 URL:		http://www.fox-toolkit.org/fox.html
-BuildRequires:	OpenGL-devel
-BuildRequires:	autoconf
+BuildRequires:	OpenGL-GLU-devel
+BuildRequires:	autoconf >= 2.59-9
 BuildRequires:	automake
-BuildRequires:	bzip2-devel
-BuildRequires:	libjpeg-devel
-BuildRequires:	libpng-devel
+BuildRequires:	bzip2-devel >= 1.0.2
+BuildRequires:	libjpeg-devel >= 6b
+BuildRequires:	libpng-devel >= 1.2.5
 BuildRequires:	libstdc++-devel
-BuildRequires:	libtiff-devel
-BuildRequires:	libtool
-BuildRequires:	xcursor-devel
+BuildRequires:	libtiff-devel >= 3.5.7
+BuildRequires:	libtool >= 2:1.5
+BuildRequires:	xorg-lib-libXcursor-devel
+BuildRequires:	xorg-lib-libXext-devel
+BuildRequires:	xorg-lib-libXft-devel
+BuildRequires:	xorg-lib-libXrandr-devel
+BuildRequires:	zlib-devel >= 1.1.4
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define 	_noautoreqdep	libGL.so.1 libGLU.so.1
@@ -51,7 +55,7 @@
 Summary(pl):	Przykłady aplikacji w FOX
 Group:		X11/Applications
 Requires:	%{name} = %{version}-%{release}
-Obsoletes:	%{name}-example-apps
+Obsoletes:	fox-example-apps
 
 %description progs
 Editor and file browser, written with FOX.
@@ -64,13 +68,17 @@
 Summary(pl):	Pliki nagłówkowe biblioteki FOX
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	OpenGL-devel
-Requires:	bzip2-devel
-Requires:	libjpeg-devel
-Requires:	libpng-devel
+Requires:	OpenGL-GLU-devel
+Requires:	bzip2-devel >= 1.0.2
+Requires:	libjpeg-devel >= 6b
+Requires:	libpng-devel >= 1.2.5
 Requires:	libstdc++-devel
-Requires:	libtiff-devel
-Requires:	xcursor-devel
+Requires:	libtiff-devel >= 3.5.7
+Requires:	xorg-lib-libXcursor-devel
+Requires:	xorg-lib-libXext-devel
+Requires:	xorg-lib-libXft-devel
+Requires:	xorg-lib-libXrandr-devel
+Requires:	zlib-devel >= 1.1.4
 
 %description devel
 Header files for FOX library.
@@ -112,11 +120,11 @@
 %{__aclocal}
 %{__autoconf}
 %{__automake}
-LDFLAGS="%{rpmldflags} -L/usr/X11R6/%{_lib}"
 %configure \
-	--with-opengl \
 	%{?debug:--enable-debug}%{!?debug:--enable-release} \
-	--enable-static=%{?with_static_libs:yes}%{!?with_static_libs:no}
+	--enable-static=%{?with_static_libs:yes}%{!?with_static_libs:no} \
+	--with-opengl \
+	--with-xft
 %{__make}
 
 %install
@@ -175,6 +183,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.85  2006/04/02 18:18:33  qboosh
+- switched to modular xorg, enabled xft
+- release 2
+
 Revision 1.84  2006/03/21 21:02:37  qboosh
 - bcond header, dropped non-versioned OpenGL dep
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/fox.spec?r1=1.84&r2=1.85&f=u