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

diff --git a/fox.spec b/fox.spec
index 0476e10..66b9cbe 100644
--- a/fox.spec
+++ b/fox.spec
@@ -5,30 +5,33 @@
 Summary:	The FOX C++ GUI Toolkit
 Summary(pl.UTF-8):	FOX - toolkit graficzny w C++
 Name:		fox
-Version:	1.6.30
-Release:	1
+Version:	1.7.19
+Release:	7
 License:	LGPL
 Group:		X11/Libraries
 Source0:	ftp://ftp.fox-toolkit.com/pub/%{name}-%{version}.tar.gz
-# Source0-md5:	8585fdb7a1fbce7d3752991b9c158a69
+# Source0-md5:	fb4d0934be26c27c7e76fcbefe2b5d30
 Patch0:		%{name}-opt.patch
 Patch1:		%{name}-link.patch
 Patch2:		%{name}-Makefile.patch
-URL:		http://www.fox-toolkit.org/fox.html
+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
 BuildRequires:	doxygen
-BuildRequires:	graphviz
 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:	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)
@@ -71,6 +74,7 @@ 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
@@ -78,6 +82,7 @@ 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
 
@@ -127,6 +132,7 @@ FOX - przykładowe programy.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -134,10 +140,17 @@ FOX - przykładowe programy.
 %{__autoconf}
 %{__automake}
 %configure \
+	--enable-cups \
 	%{?debug:--enable-debug}%{!?debug:--enable-release} \
 	--enable-static=%{?with_static_libs:yes}%{!?with_static_libs:no} \
 	--with-opengl \
-	--with-xft
+	--with-xft \
+	--with-shape \
+	--with-xshm \
+	--with-xcursor \
+	--with-xrandr \
+	--with-xim
+
 %{__make}
 
 %{__make} -C doc docs
@@ -149,7 +162,7 @@ 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
 
 rm -f doc/Makefile* doc/*/Makefile*
 
@@ -165,7 +178,11 @@ 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) %{_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)
@@ -181,15 +198,19 @@ rm -rf $RPM_BUILD_ROOT
 %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}/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