X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=fox.spec;h=b0ed20262448e5ccfd9c7a62b39b8b4683d08ed4;hb=25fa430faf6a0a5da78c8ccb0c8ce3b3fc986485;hp=041a2ff5021b6ee971cfbdcbd561ea69f7052a8e;hpb=4b7aa7bf833eaa55776d37391588ba0390a6053f;p=packages%2Ffox.git

diff --git a/fox.spec b/fox.spec
index 041a2ff..b0ed202 100644
--- a/fox.spec
+++ b/fox.spec
@@ -1,17 +1,25 @@
 Summary:	The FOX C++ GUI Toolkit
 Summary(pl):	FOX - toolkit graficzny w C++
 Name:		fox
-Version:	1.0.28
+Version:	1.1.42
 Release:	1
 License:	LGPL
 Group:		X11/Libraries
-Source0:	ftp://ftp.fox-toolkit.org/pub/%{name}-%{version}.tar.gz
-URL:		http://www.cfdrc.com/FOX/fox.html
+#Source0ActiveFTP
+Source0:	http://ftp.fox-toolkit.org/ftp/%{name}-%{version}.tar.gz
+# Source0-md5:	e3dec66f5eb28f3633650794104da013
+Patch0:		%{name}-opt.patch
+Patch1:		%{name}-amfix.patch
+Patch2:		%{name}-link.patch
+URL:		http://www.fox-toolkit.org/fox.html
 BuildRequires:	OpenGL-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	libtool
+BuildRequires:	libjpeg-devel
+BuildRequires:	libpng-devel
 BuildRequires:	libstdc++-devel
+BuildRequires:	libtiff-devel
+BuildRequires:	libtool
 Requires:	OpenGL
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -72,27 +80,34 @@ Biblioteki statyczne FOX.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
-rm -f missing
-libtoolize -c -f
+%{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__automake}
-CPPFLAGS="%{rpmcflags} -frtti" \
-#CFLAGS="%{rpmcflags} -frtti" \
+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}
+
+# 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
 
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+ln -sf libFOX-1.1.so $RPM_BUILD_ROOT%{_libdir}/libFOX.so
 
-cp -p pathfinder/.libs/PathFinder $RPM_BUILD_ROOT%{_bindir}
+rm -f doc/Makefile* doc/*/Makefile*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -102,17 +117,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%doc AUTHORS LICENSE_ADDENDUM README
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 
 %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
+%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 ADDITIONS AUTHORS README TRACING doc
+%doc ADDITIONS TRACING doc
 %attr(755,root,root) %{_bindir}/reswrap
 %attr(755,root,root) %{_libdir}/lib*.so
 %{_libdir}/lib*.la