X-Git-Url: http://git.pld-linux.org/?p=packages%2Ffox.git;a=blobdiff_plain;f=fox.spec;h=fe981f132a3218530a33de3dc2b2efd48e72aab9;hp=7bc92462aef7886bc6aeb2c5c6bca335d353e3b0;hb=d0165c5c9ee8e0e7f8514a01616489d863d3c7e1;hpb=acb15f08f24ca9f58b7e4349f55c7dd366596b52

diff --git a/fox.spec b/fox.spec
index 7bc9246..fe981f1 100644
--- a/fox.spec
+++ b/fox.spec
@@ -1,37 +1,47 @@
 #
 # Conditional build:
+%bcond_without	cups		# CUPS support
+%bcond_without	openjpeg	# JPEG2000 support
 %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:	1.6.2
-Release:	1
-License:	LGPL
+# NOTE: after switching to 1.8.x keep stable (1.8.x) on HEAD and devel (1.9.x) on DEVEL
+Version:	1.7.57
+Release:	3
+License:	LGPL v3+ with relinking exemption
 Group:		X11/Libraries
-Source0:	ftp://ftp.fox-toolkit.com/pub/%{name}-%{version}.tar.gz
-# Source0-md5:	b80ac871da0c73972f4081b114858940
+Source0:	http://ftp.fox-toolkit.org/pub/%{name}-%{version}.tar.gz
+# Source0-md5:	caeed36d43b5d4f18193657bf236200d
 Patch0:		%{name}-opt.patch
 Patch1:		%{name}-link.patch
 Patch2:		%{name}-Makefile.patch
-URL:		http://www.fox-toolkit.org/fox.html
+Patch3:		x32.patch
+URL:		http://www.fox-toolkit.org/
 BuildRequires:	OpenGL-GLU-devel
 BuildRequires:	autoconf >= 2.59-9
 BuildRequires:	automake
 BuildRequires:	bzip2-devel >= 1.0.2
+%{?with_cups:BuildRequires:	cups-devel}
+BuildRequires:	doxygen
 BuildRequires:	libjpeg-devel >= 6b
 BuildRequires:	libpng-devel >= 1.2.5
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtiff-devel >= 3.5.7
 BuildRequires:	libtool >= 2:1.5
+BuildRequires:	libwebp-devel
+%{?with_openjpeg:BuildRequires:	openjpeg-devel}
+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		_noautoreqdep	libGL.so.1 libGLU.so.1
 
 %description
 FOX is a C++-Based Library for Graphical User Interface Development
@@ -41,17 +51,17 @@ 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, przetwarzanie 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
 Requires:	%{name} = %{version}-%{release}
 Obsoletes:	fox-example-apps
@@ -59,60 +69,77 @@ 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 for FOX library
-Summary(pl):	Pliki nag³ówkowe biblioteki FOX
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki FOX
 Group:		X11/Development/Libraries
 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:	libwebp-devel
+%{?with_openjpeg:Requires:	openjpeg-devel}
 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 for FOX library.
 
-%description devel -l pl
-Pliki nag³ówkowe 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
 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):	Dokumentacja programisty do biblioteki FOX
+Summary(pl.UTF-8):	Dokumentacja programisty do biblioteki FOX
 Group:		X11/Development/Libraries
 
 %description doc
 Development documentation for FOX library.
 
-%description doc -l pl
+%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
 %{__libtoolize}
@@ -120,22 +147,34 @@ Dokumentacja programisty do biblioteki FOX.
 %{__autoconf}
 %{__automake}
 %configure \
+	%{?with_cups:--enable-cups} \
 	%{?debug:--enable-debug}%{!?debug:--enable-release} \
-	--enable-static=%{?with_static_libs:yes}%{!?with_static_libs:no} \
+	%{?with_openjpeg:--enable-jp2} \
+	--enable-static%{!?with_static_libs:=no} \
+	--enable-webp \
 	--with-opengl \
-	--with-xft
+	--with-shape \
+	--with-xcursor \
+	--with-xft \
+	--with-xim \
+	--with-xrandr \
+	--with-xshm
+
 %{__make}
 
 %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.6.so $RPM_BUILD_ROOT%{_libdir}/libFOX.so
+ln -sf libFOX-1.7.so $RPM_BUILD_ROOT%{_libdir}/libFOX.so
+
+%{__make} -C tests clean
+cp -r tests/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
-rm -f doc/Makefile* doc/*/Makefile*
+%{__rm} doc/Makefile* doc/*/Makefile*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -146,32 +185,50 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS LICENSE_ADDENDUM README
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%attr(755,root,root) %{_bindir}/ControlPanel
+%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
+%{_mandir}/man1/ControlPanel.1*
 
 %files progs
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/Adie.stx
+%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/*
+%{_mandir}/man1/PathFinder.1*
+%{_mandir}/man1/adie.1*
+%{_mandir}/man1/calculator.1*
+%{_mandir}/man1/shutterbug.1*
 
 %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
-%{_includedir}/fox-1.6
+%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}/fox17.pc
+%{_mandir}/man1/reswrap.1*
 
 %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}