X-Git-Url: http://git.pld-linux.org/?p=packages%2Ffox.git;a=blobdiff_plain;f=fox.spec;h=c0c415201a0801417366ce6f728b8df5921b8500;hp=1309fdff5aa6a5877b7342d805415f2facb6f08e;hb=502896708588bb3efdcf9857e56a1562c60cecef;hpb=44b8aa1d9b39850a7f3dcd9c4fde94c18b0f54a9

diff --git a/fox.spec b/fox.spec
index 1309fdf..c0c4152 100644
--- a/fox.spec
+++ b/fox.spec
@@ -1,30 +1,39 @@
+#
+# 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:	0.99.189
+Version:	1.6.9
 Release:	1
 License:	LGPL
 Group:		X11/Libraries
-Group(de):	X11/Libraries
-Group(es):	X11/Bibliotecas
-Group(fr):	X11/Librairies
-Group(pl):	X11/Biblioteki
-Group(pt_BR):	X11/Bibliotecas
-Group(ru):	X11/âÉÂÌÉÏÔÅËÉ
-Group(uk):	X11/â¦Â̦ÏÔÅËÉ
-Source0:	ftp://ftp.fox-toolkit.org/pub/%{name}-%{version}.tar.gz
-URL:		http://www.cfdrc.com/FOX/fox.html
-BuildRequires:	autoconf
+Source0:	ftp://ftp.fox-toolkit.com/pub/%{name}-%{version}.tar.gz
+# Source0-md5:	8ab8274237431865f57b2f5596374a65
+Patch0:		%{name}-opt.patch
+Patch1:		%{name}-link.patch
+Patch2:		%{name}-Makefile.patch
+URL:		http://www.fox-toolkit.org/fox.html
+BuildRequires:	OpenGL-GLU-devel
+BuildRequires:	autoconf >= 2.59-9
 BuildRequires:	automake
-BuildRequires:	libtool
-BuildRequires:	OpenGL-devel
+BuildRequires:	bzip2-devel >= 1.0.2
+BuildRequires:	doxygen
+BuildRequires:	graphviz
+BuildRequires:	libjpeg-devel >= 6b
+BuildRequires:	libpng-devel >= 1.2.5
 BuildRequires:	libstdc++-devel
-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
-%define		_prefix		/usr/X11R6
-%define		_mandir		%{_prefix}/man
 
 %description
 FOX is a C++-Based Library for Graphical User Interface Development
@@ -38,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.
 
@@ -46,13 +55,8 @@ rozszerzanie.
 Summary:	FOX example applications
 Summary(pl):	Przyk³ady aplikacji w FOX
 Group:		X11/Applications
-Group(de):	X11/Applikationen
-Group(es):	X11/Aplicaciones
-Group(pl):	X11/Aplikacje
-Group(pt_BR):	X11/Aplicações
-Group(pt):	X11/Aplicações
-Requires:	%{name} = %{version}
-Obsoletes:	%{name}-example-apps
+Requires:	%{name} = %{version}-%{release}
+Obsoletes:	fox-example-apps
 
 %description progs
 Editor and file browser, written with FOX.
@@ -61,36 +65,33 @@ Editor and file browser, written with FOX.
 Edytor i przegl±darka plików napisane z u¿yciem toolkitu FOX.
 
 %package devel
-Summary:	Header files and development documentation for the FOX library
-Summary(pl):	Pliki nag³ówkowe i dokumentacja do biblioteki FOX
+Summary:	Header files for FOX library
+Summary(pl):	Pliki nag³ówkowe biblioteki FOX
 Group:		X11/Development/Libraries
-Group(de):	X11/Entwicklung/Libraries
-Group(es):	X11/Desarrollo/Bibliotecas
-Group(fr):	X11/Development/Librairies
-Group(pl):	X11/Programowanie/Biblioteki
-Group(pt_BR):	X11/Desenvolvimento/Bibliotecas
-Group(ru):	X11/òÁÚÒÁÂÏÔËÁ/âÉÂÌÉÏÔÅËÉ
-Group(uk):	X11/òÏÚÒÏÂËÁ/â¦Â̦ÏÔÅËÉ
-Requires:	%{name} = %{version}
+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 and development documentation for the FOX library.
+Header files for FOX library.
 
 %description devel -l pl
-Pliki nag³ówkowe i dokumentacja programisty do biblioteki FOX.
+Pliki nag³ówkowe biblioteki FOX.
 
 %package static
 Summary:	FOX static libraries
 Summary(pl):	Biblioteki statyczne FOX
 Group:		X11/Development/Libraries
-Group(de):	X11/Entwicklung/Libraries
-Group(es):	X11/Desarrollo/Bibliotecas
-Group(fr):	X11/Development/Librairies
-Group(pl):	X11/Programowanie/Biblioteki
-Group(pt_BR):	X11/Desenvolvimento/Bibliotecas
-Group(ru):	X11/òÁÚÒÁÂÏÔËÁ/âÉÂÌÉÏÔÅËÉ
-Group(uk):	X11/òÏÚÒÏÂËÁ/â¦Â̦ÏÔÅËÉ
-Requires:	%{name}-devel = %{version}
+Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
 FOX static libraries.
@@ -98,31 +99,62 @@ FOX static libraries.
 %description static -l pl
 Biblioteki statyczne FOX.
 
+%package doc
+Summary:	Development documentation for FOX library
+Summary(pl):	Dokumentacja programisty do biblioteki FOX
+Group:		X11/Development/Libraries
+
+%description doc
+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
-rm -f missing
-libtoolize -c -f
-aclocal
-autoconf
-automake -a -c
-CPPFLAGS="%{rpmcflags} -frtti" \
-#CFLAGS="%{rpmcflags} -frtti" \
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__automake}
 %configure \
-	--with-opengl=mesa \
-	--enable-release
-%{__make} GL_LIBS="-lGL -lGLU"
+	%{?debug:--enable-debug}%{!?debug:--enable-release} \
+	--enable-static=%{?with_static_libs:yes}%{!?with_static_libs:no} \
+	--with-opengl \
+	--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
 
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+ln -sf libFOX-1.6.so $RPM_BUILD_ROOT%{_libdir}/libFOX.so
 
-cp -p pathfinder/.libs/PathFinder $RPM_BUILD_ROOT%{_bindir}
+rm -f doc/Makefile* doc/*/Makefile*
 
-gzip -9nf ADDITIONS AUTHORS README TRACING
+%{__make} -C tests clean
+cp -r tests/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -132,23 +164,38 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%doc AUTHORS LICENSE_ADDENDUM README
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 
 %files progs
 %defattr(644,root,root,755)
-%attr(755,root,root) /%{_bindir}/adie
-%attr(755,root,root) /%{_bindir}/calculator
-%attr(755,root,root) /%{_bindir}/PathFinder
+%attr(755,root,root) %{_bindir}/adie
+%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 *.gz doc
+%doc ADDITIONS TRACING
+%attr(755,root,root) %{_bindir}/fox-config
 %attr(755,root,root) %{_bindir}/reswrap
 %attr(755,root,root) %{_libdir}/lib*.so
-%attr(755,root,root) %{_libdir}/lib*.la
-%{_mandir}/man1/*
-%{_includedir}/fox
+%{_libdir}/lib*.la
+%{_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}