X-Git-Url: http://git.pld-linux.org/?p=packages%2Ffox.git;a=blobdiff_plain;f=fox.spec;h=b8b8d5c38b42439308812818ab2f5bb6d4d181a8;hp=d95fad1cafa82a94419234f855214d5d75e9913d;hb=1dd86de4b959d375c2ebe63f7bb226eb64e18e80;hpb=f25915bab3d1614a4bb95e9c499fe7eec936a8f2

diff --git a/fox.spec b/fox.spec
index d95fad1..b8b8d5c 100644
--- a/fox.spec
+++ b/fox.spec
@@ -1,24 +1,36 @@
+#
+# Conditional build:
+%bcond_without	static_libs	# don't build static libraries
+#
 Summary:	The FOX C++ GUI Toolkit
 Summary(pl):	FOX - toolkit graficzny w C++
 Name:		fox
-Version:	1.2.9
-Release:	2
+Version:	1.6.20
+Release:	1
 License:	LGPL
 Group:		X11/Libraries
-Source0:	http://www.fox-toolkit.org/ftp/%{name}-%{version}.tar.gz
-# Source0-md5:	6cf5a0562ea2a097e6d1e0c4fd9d1bba
+Source0:	ftp://ftp.fox-toolkit.com/pub/%{name}-%{version}.tar.gz
+# Source0-md5:	bcaa72aa6fdda4f88a5c9518a22b9948
 Patch0:		%{name}-opt.patch
 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:	libjpeg-devel
-BuildRequires:	libpng-devel
+BuildRequires:	bzip2-devel >= 1.0.2
+BuildRequires:	doxygen
+BuildRequires:	graphviz
+BuildRequires:	libjpeg-devel >= 6b
+BuildRequires:	libpng-devel >= 1.2.5
 BuildRequires:	libstdc++-devel
-BuildRequires:	libtiff-devel
-BuildRequires:	libtool
-Requires:	OpenGL
+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
@@ -35,7 +47,7 @@ beyond the built-in widgets by application writers.
 FOX jest bibliotek± bazuj±c± na C++ do projektowania graficznych
 interfejsów u¿ytkownika. Obs³uguje wiele w³a¶ciwo¶ci wspó³czesnych
 GUI: Drag-and-Drop, listy, ikony, interfejsy wielodokumentowe (MDI),
-liczniki, przetwarznie w tle, automatyczne uaktualnianie GUI, obs³ugê
+liczniki, przetwarzanie w tle, automatyczne uaktualnianie GUI, obs³ugê
 grafiki OpenGL. Bazowe klasy widgetów FOX pozwalaj± na ³atwe
 rozszerzanie.
 
@@ -44,7 +56,7 @@ Summary:	FOX example applications
 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.
@@ -57,6 +69,17 @@ Summary:	Header files for FOX library
 Summary(pl):	Pliki nag³ówkowe biblioteki FOX
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+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 >= 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.
@@ -87,33 +110,52 @@ Development documentation for FOX library.
 %description doc -l pl
 Dokumentacja programisty do biblioteki FOX.
 
+%package examples
+Summary:	FOX - example programs
+Summary(pl):	FOX - programy przyk³adowe
+Group:		X11/Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+
+%description examples
+FOX - example programs.
+
+%description examples -l pl
+FOX - przyk³adowe programy.
+
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__automake}
-LDFLAGS="%{rpmldflags} -L/usr/X11R6/%{_lib}"
 %configure \
+	%{?debug:--enable-debug}%{!?debug:--enable-release} \
+	--enable-static=%{?with_static_libs:yes}%{!?with_static_libs:no} \
 	--with-opengl \
-	%{?debug:--enable-debug}%{!?_debug:--enable-release}
+	--with-xft
 %{__make}
 
+%{__make} -C doc docs
+
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_datadir}
+install -d $RPM_BUILD_ROOT{%{_datadir},%{_examplesdir}/%{name}-%{version}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-ln -sf libFOX-1.2.so $RPM_BUILD_ROOT%{_libdir}/libFOX.so
+ln -sf libFOX-1.6.so $RPM_BUILD_ROOT%{_libdir}/libFOX.so
 
 rm -f doc/Makefile* doc/*/Makefile*
 
+%{__make} -C tests clean
+cp -r tests/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -131,20 +173,29 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/calculator
 %attr(755,root,root) %{_bindir}/PathFinder
 %attr(755,root,root) %{_bindir}/shutterbug
+%attr(755,root,root) %{_bindir}/Adie.stx
+%{_mandir}/man1/*
 
 %files devel
 %defattr(644,root,root,755)
 %doc ADDITIONS TRACING
+%attr(755,root,root) %{_bindir}/fox-config
 %attr(755,root,root) %{_bindir}/reswrap
 %attr(755,root,root) %{_libdir}/lib*.so
 %{_libdir}/lib*.la
-%{_mandir}/man1/*
-%{_includedir}/fox-1.2
+%{_includedir}/fox-1.6
+%{_pkgconfigdir}/fox.pc
 
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/lib*.a
+%endif
 
 %files doc
 %defattr(644,root,root,755)
 %doc doc/*
+
+%files examples
+%defattr(644,root,root,755)
+%{_examplesdir}/%{name}-%{version}