- rebuild without libjpeg.la

[packages/fox.git] / fox.spec

diff --git a/fox.spec b/fox.spec
index 50d57b1147ce25185ce82d8d51a40ab4e5aecf7d..fe981f132a3218530a33de3dc2b2efd48e72aab9 100644 (file)
--- a/fox.spec
+++ b/fox.spec
@@ -1,22 +1,23 @@
 #
 # Conditional build:
 %bcond_without cups            # CUPS support
-%bcond_with    openjpeg        # JPEG2000 support (unfinished in sources)
+%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
 # NOTE: after switching to 1.8.x keep stable (1.8.x) on HEAD and devel (1.9.x) on DEVEL
-Version:       1.7.34
-Release:       2
+Version:       1.7.57
+Release:       3
 License:       LGPL v3+ with relinking exemption
 Group:         X11/Libraries
 Source0:       http://ftp.fox-toolkit.org/pub/%{name}-%{version}.tar.gz
-# Source0-md5: 6ccb46e6a8bf91e33fa3e80ecadb9527
+# Source0-md5: caeed36d43b5d4f18193657bf236200d
 Patch0:                %{name}-opt.patch
 Patch1:                %{name}-link.patch
 Patch2:                %{name}-Makefile.patch
+Patch3:                x32.patch
 URL:           http://www.fox-toolkit.org/
 BuildRequires: OpenGL-GLU-devel
 BuildRequires: autoconf >= 2.59-9
@@ -40,7 +41,7 @@ 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
@@ -138,6 +139,7 @@ FOX - przykładowe programy.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -149,13 +151,14 @@ FOX - przykładowe programy.
        %{?debug:--enable-debug}%{!?debug:--enable-release} \
        %{?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}
 
@@ -204,6 +207,7 @@ rm -rf $RPM_BUILD_ROOT
 %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}/libCHART-1.7.so
 %attr(755,root,root) %{_libdir}/libFOX-1.7.so