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

diff --git a/fox.spec b/fox.spec
index 66b9cbe..60a4fd9 100644
--- a/fox.spec
+++ b/fox.spec
@@ -1,32 +1,36 @@
 #
 # 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.UTF-8):	FOX - toolkit graficzny w C++
 Name:		fox
-Version:	1.7.19
-Release:	7
-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.49
+Release:	2
+License:	LGPL v3+ with relinking exemption
 Group:		X11/Libraries
-Source0:	ftp://ftp.fox-toolkit.com/pub/%{name}-%{version}.tar.gz
-# Source0-md5:	fb4d0934be26c27c7e76fcbefe2b5d30
+Source0:	http://ftp.fox-toolkit.org/pub/%{name}-%{version}.tar.gz
+# Source0-md5:	8563e4c0eb8ebd3511ef02cd5ba0bf51
 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:	bzip2-devel >= 1.0.2
-BuildRequires:	cups-devel
+%{?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
@@ -79,6 +83,8 @@ 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
@@ -132,7 +138,6 @@ FOX - przykładowe programy.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -140,21 +145,21 @@ FOX - przykładowe programy.
 %{__autoconf}
 %{__automake}
 %configure \
-	--enable-cups \
+	%{?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-xshm \
 	--with-xcursor \
+	--with-xft \
+	--with-xim \
 	--with-xrandr \
-	--with-xim
+	--with-xshm
 
 %{__make}
 
-%{__make} -C doc docs
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_datadir},%{_examplesdir}/%{name}-%{version}}
@@ -164,11 +169,11 @@ install -d $RPM_BUILD_ROOT{%{_datadir},%{_examplesdir}/%{name}-%{version}}
 
 ln -sf libFOX-1.7.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}
 
+%{__rm} doc/Makefile* doc/*/Makefile*
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -178,20 +183,24 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS LICENSE_ADDENDUM README
+%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
-%attr(755,root,root) %{_bindir}/ControlPanel
+%{_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)
@@ -204,7 +213,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libCHART-1.7.la
 %{_libdir}/libFOX-1.7.la
 %{_includedir}/fox-1.7
-%{_pkgconfigdir}/fox.pc
+%{_pkgconfigdir}/fox17.pc
+%{_mandir}/man1/reswrap.1*
 
 %if %{with static_libs}
 %files static