X-Git-Url: http://git.pld-linux.org/?p=packages%2Ffox.git;a=blobdiff_plain;f=fox.spec;h=66b9cbe2dc49aa042916c162f29ea67eebc71648;hp=9b7ab91699d3b65abe7488ae4feab2f95ace4ffc;hb=254babe726d6f7d9409b72c33275b6194722d8f4;hpb=2d7512247b1f88255ec7da6a6445b89c49ff3555

diff --git a/fox.spec b/fox.spec
index 9b7ab91..66b9cbe 100644
--- a/fox.spec
+++ b/fox.spec
@@ -1,30 +1,42 @@
+#
+# Conditional build:
+%bcond_without	static_libs	# don't build static libraries
+#
 Summary:	The FOX C++ GUI Toolkit
-Summary(pl):	FOX - toolkit graficzny w C++
+Summary(pl.UTF-8):	FOX - toolkit graficzny w C++
 Name:		fox
-Version:	0.99.179
-Release:	1
+Version:	1.7.19
+Release:	7
 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:	fb4d0934be26c27c7e76fcbefe2b5d30
+Patch0:		%{name}-opt.patch
+Patch1:		%{name}-link.patch
+Patch2:		%{name}-Makefile.patch
+Patch3:		pkgconfig.patch
+URL:		http://www.fox-toolkit.org/
+BuildRequires:	OpenGL-GLU-devel
+BuildRequires:	autoconf >= 2.59-9
 BuildRequires:	automake
-BuildRequires:	libtool
-BuildRequires:	OpenGL-devel
+BuildRequires:	bzip2-devel >= 1.0.2
+BuildRequires:	cups-devel
+BuildRequires:	doxygen
+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:	pkgconfig
+BuildRequires:	xorg-lib-libXcursor-devel
+BuildRequires:	xorg-lib-libXext-devel
+BuildRequires:	xorg-lib-libXft-devel
+BuildRequires:	xorg-lib-libXi-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
@@ -34,92 +46,128 @@ idle processing, automatic GUI updating, as well as OpenGL/Mesa for 3D
 graphics. Subclassing of basic FOX widgets allows for easy extension
 beyond the built-in widgets by application writers.
 
-%description -l pl
-FOX jest bibliotek± bazuj±c± na C++ do projektowania graficznych
-interfejsów u¿ytkownika. Obs³uguje wiele w³a¶ciwo¶ci wspó³czesnych
+%description -l pl.UTF-8
+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ê
-grafiki OpenGL. Bazowe klasy widgetów FOX pozwalaj± na ³atwe
+liczniki, przetwarzanie w tle, automatyczne uaktualnianie GUI, obsługę
+grafiki OpenGL. Bazowe klasy widgetów FOX pozwalają na łatwe
 rozszerzanie.
 
 %package progs
 Summary:	FOX example applications
-Summary(pl):	Przyk³ady aplikacji w FOX
+Summary(pl.UTF-8):	Przykłady aplikacji w FOX
 Group:		X11/Applications
-Group(de):	X11/Applikationen
-Group(pl):	X11/Aplikacje
-Requires:	%{name} = %{version}
-Obsoletes:	%{name}-example-apps
+Requires:	%{name} = %{version}-%{release}
+Obsoletes:	fox-example-apps
 
 %description progs
 Editor and file browser, written with FOX.
 
-%description progs -l pl
-Edytor i przegl±darka plików napisane z u¿yciem toolkitu FOX.
+%description progs -l pl.UTF-8
+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.UTF-8):	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:	cups-devel
+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-libXi-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.
+%description devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki FOX.
 
 %package static
 Summary:	FOX static libraries
-Summary(pl):	Biblioteki statyczne FOX
+Summary(pl.UTF-8):	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.
 
-%description static -l pl
+%description static -l pl.UTF-8
 Biblioteki statyczne FOX.
 
+%package doc
+Summary:	Development documentation for FOX library
+Summary(pl.UTF-8):	Dokumentacja programisty do biblioteki FOX
+Group:		X11/Development/Libraries
+
+%description doc
+Development documentation for FOX library.
+
+%description doc -l pl.UTF-8
+Dokumentacja programisty do biblioteki FOX.
+
+%package examples
+Summary:	FOX - example programs
+Summary(pl.UTF-8):	FOX - programy przykładowe
+Group:		X11/Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+
+%description examples
+FOX - example programs.
+
+%description examples -l pl.UTF-8
+FOX - przykładowe programy.
+
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -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"
+	--enable-cups \
+	%{?debug:--enable-debug}%{!?debug:--enable-release} \
+	--enable-static=%{?with_static_libs:yes}%{!?with_static_libs:no} \
+	--with-opengl \
+	--with-xft \
+	--with-shape \
+	--with-xshm \
+	--with-xcursor \
+	--with-xrandr \
+	--with-xim
+
+%{__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.7.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
@@ -129,24 +177,46 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/reswrap
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
-%{_mandir}/*/*
+%doc AUTHORS LICENSE_ADDENDUM README
+%attr(755,root,root) %{_libdir}/libCHART-1.7.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libCHART-1.7.so.0
+%attr(755,root,root) %{_libdir}/libFOX-1.7.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libFOX-1.7.so.0
+%attr(755,root,root) %{_bindir}/ControlPanel
 
 %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
-%attr(755,root,root) %{_libdir}/lib*.so
-%attr(755,root,root) %{_libdir}/lib*.la
-%{_includedir}/fox
-
+%doc ADDITIONS TRACING
+%attr(755,root,root) %{_bindir}/fox-config
+%attr(755,root,root) %{_bindir}/reswrap
+%attr(755,root,root) %{_libdir}/libCHART-1.7.so
+%attr(755,root,root) %{_libdir}/libFOX-1.7.so
+%attr(755,root,root) %{_libdir}/libFOX.so
+%{_libdir}/libCHART-1.7.la
+%{_libdir}/libFOX-1.7.la
+%{_includedir}/fox-1.7
+%{_pkgconfigdir}/fox.pc
+
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libCHART-1.7.a
+%{_libdir}/libFOX-1.7.a
+%endif
+
+%files doc
+%defattr(644,root,root,755)
+%doc doc/*
+
+%files examples
+%defattr(644,root,root,755)
+%{_examplesdir}/%{name}-%{version}