- updated to 1.1.45

[packages/fox.git] / fox.spec

diff --git a/fox.spec b/fox.spec
index a4d2d99976d743f6a8c71dad39971a813e3da7dd..73df80e71250d3ca14f57df0c95a75b2f0493e36 100644 (file)
--- a/fox.spec
+++ b/fox.spec
@@ -1,14 +1,14 @@
 Summary:       The FOX C++ GUI Toolkit
 Summary(pl):   FOX - toolkit graficzny w C++
 Name:          fox
-Version:       1.1.33
+Version:       1.1.45
 Release:       1
 License:       LGPL
 Group:         X11/Libraries
-#Source0ActiveFTP
 Source0:       http://ftp.fox-toolkit.org/ftp/%{name}-%{version}.tar.gz
-# Source0-md5: 6f28aa7e19321dc7176d2b59e0b227f1
+# Source0-md5: 730d817501a6a2589ca7312503f623dd
 Patch0:                %{name}-opt.patch
+Patch1:                %{name}-link.patch
 URL:           http://www.fox-toolkit.org/fox.html
 BuildRequires: OpenGL-devel
 BuildRequires: autoconf
@@ -78,15 +78,16 @@ Biblioteki statyczne FOX.
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
+%patch1 -p1
 
 %build
-rm -f missing
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__automake}
-%configure LDFLAGS="-L/usr/X11R6/lib"\
+LDFLAGS="%{rpmldflags} -L/usr/X11R6/%{_lib}"
+%configure \
        --with-opengl \
        %{?debug:--enable-debug}%{!?_debug:--enable-release}
 %{__make}
@@ -95,10 +96,13 @@ rm -f missing
 rm -rf $RPM_BUILD_ROOT
 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
+       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
 
 rm -f doc/Makefile* doc/*/Makefile*
 
@@ -110,7 +114,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS README
+%doc AUTHORS LICENSE_ADDENDUM README
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 
 %files progs
@@ -118,6 +122,7 @@ rm -rf $RPM_BUILD_ROOT
 %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)