X-Git-Url: http://git.pld-linux.org/?p=packages%2Ffox.git;a=blobdiff_plain;f=fox.spec;h=73df80e71250d3ca14f57df0c95a75b2f0493e36;hp=ac18ed01972fa32795af2f002df22d2dd3254318;hb=28a38b78a651df93658a0cee8c000d9b04755ad9;hpb=fec338f6653b24e685deaca8dec3e85f31b88584

diff --git a/fox.spec b/fox.spec
index ac18ed0..73df80e 100644
--- a/fox.spec
+++ b/fox.spec
@@ -1,30 +1,27 @@
 Summary:	The FOX C++ GUI Toolkit
 Summary(pl):	FOX - toolkit graficzny w C++
 Name:		fox
-Version:	0.99.177
+Version:	1.1.45
 Release:	1
 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
+Source0:	http://ftp.fox-toolkit.org/ftp/%{name}-%{version}.tar.gz
+# Source0-md5:	730d817501a6a2589ca7312503f623dd
+Patch0:		%{name}-opt.patch
+Patch1:		%{name}-link.patch
+URL:		http://www.fox-toolkit.org/fox.html
+BuildRequires:	OpenGL-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	libtool
-BuildRequires:	OpenGL-devel
+BuildRequires:	libjpeg-devel
+BuildRequires:	libpng-devel
 BuildRequires:	libstdc++-devel
+BuildRequires:	libtiff-devel
+BuildRequires:	libtool
 Requires:	OpenGL
 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
@@ -46,8 +43,6 @@ rozszerzanie.
 Summary:	FOX example applications
 Summary(pl):	Przyk³ady aplikacji w FOX
 Group:		X11/Applications
-Group(de):	X11/Applikationen
-Group(pl):	X11/Aplikacje
 Requires:	%{name} = %{version}
 Obsoletes:	%{name}-example-apps
 
@@ -61,13 +56,6 @@ Edytor i przegl
 Summary:	Header files and development documentation for the FOX library
 Summary(pl):	Pliki nag³ówkowe i dokumentacja do 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}
 
 %description devel
@@ -80,13 +68,6 @@ Pliki nag
 Summary:	FOX static libraries
 Summary(pl):	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}
 
 %description static
@@ -97,29 +78,33 @@ Biblioteki statyczne FOX.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
-rm -f missing
-libtoolize -c -f
-aclocal
-autoconf
-automake -a -c
-CPPFLAGS="%{rpmcflags} -frtti" \
-#CFLAGS="%{rpmcflags} -frtti" \
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__automake}
+LDFLAGS="%{rpmldflags} -L/usr/X11R6/%{_lib}"
 %configure \
-	--with-opengl=mesa \
-	--enable-release
-%{__make} GL_LIBS="-lGL -lGLU"
+	--with-opengl \
+	%{?debug:--enable-debug}%{!?_debug:--enable-release}
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/%{_datadir}
+install -d $RPM_BUILD_ROOT%{_datadir}
 
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+# new fox installs headers in include/fox-1.1, but apps expect them as <fox/*.h>
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT \
+	foxincludedir=%{_includedir}/fox \
+	chartincludedir=%{_includedir}/fox/chart
 
-cp -p pathfinder/.libs/PathFinder $RPM_BUILD_ROOT%{_bindir}
+ln -sf libFOX-1.1.so $RPM_BUILD_ROOT%{_libdir}/libFOX.so
 
-gzip -9nf ADDITIONS AUTHORS BUGS README TRACING
+rm -f doc/Makefile* doc/*/Makefile*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -129,22 +114,23 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/reswrap
+%doc AUTHORS LICENSE_ADDENDUM README
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
-%{_mandir}/*/*
 
 %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
-%{_mandir}/man1/*
+%attr(755,root,root) %{_bindir}/adie
+%attr(755,root,root) %{_bindir}/calculator
+%attr(755,root,root) %{_bindir}/PathFinder
+%attr(755,root,root) %{_bindir}/shutterbug
 
 %files devel
 %defattr(644,root,root,755)
-%doc *.gz doc
+%doc ADDITIONS TRACING doc
+%attr(755,root,root) %{_bindir}/reswrap
 %attr(755,root,root) %{_libdir}/lib*.so
-%attr(755,root,root) %{_libdir}/lib*.la
+%{_libdir}/lib*.la
+%{_mandir}/man1/*
 %{_includedir}/fox
 
 %files static