- updated to 1.6.0, updated link patch

[packages/fox.git] / fox.spec

diff --git a/fox.spec b/fox.spec
index 37b8bba6736e7144de67e060cd47a8632ff1bde6..a436f86921a9cef1a522e85f337fb635dafdf7b7 100644 (file)
--- a/fox.spec
+++ b/fox.spec
@@ -1,23 +1,30 @@
 Summary:       The FOX C++ GUI Toolkit
 Summary(pl):   FOX - toolkit graficzny w C++
 Name:          fox
-Version:       1.0.11
+Version:       1.6.0
 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
+Source0:       ftp://ftp.fox-toolkit.com/pub/%{name}-%{version}.tar.gz
+# Source0-md5: 4f3a57360e1d27e07991a5d98c60b1b2
+Patch0:                %{name}-opt.patch
+Patch1:                %{name}-link.patch
+Patch2:                %{name}-Makefile.patch
+URL:           http://www.fox-toolkit.org/fox.html
+BuildRequires: OpenGL-devel
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: libtool
-BuildRequires: OpenGL-devel
+BuildRequires: bzip2-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
 BuildRequires: libstdc++-devel
+BuildRequires: libtiff-devel
+BuildRequires: libtool
+BuildRequires: xcursor-devel
 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
@@ -31,7 +38,7 @@ beyond the built-in widgets by application writers.
 FOX jest bibliotek± bazuj±c± na C++ do projektowania graficznych
 interfejsów u¿ytkownika. Obs³uguje wiele w³a¶ciwo¶ci wspó³czesnych
 GUI: Drag-and-Drop, listy, ikony, interfejsy wielodokumentowe (MDI),
-liczniki, przetwarznie w tle, automatyczne uaktualnianie GUI, obs³ugê
+liczniki, przetwarzanie w tle, automatyczne uaktualnianie GUI, obs³ugê
 grafiki OpenGL. Bazowe klasy widgetów FOX pozwalaj± na ³atwe
 rozszerzanie.
 
@@ -39,7 +46,7 @@ rozszerzanie.
 Summary:       FOX example applications
 Summary(pl):   Przyk³ady aplikacji w FOX
 Group:         X11/Applications
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{release}
 Obsoletes:     %{name}-example-apps
 
 %description progs
@@ -49,22 +56,29 @@ Editor and file browser, written with FOX.
 Edytor i przegl±darka plików napisane z u¿yciem toolkitu FOX.
 
 %package devel
-Summary:       Header files and development documentation for the FOX library
-Summary(pl):   Pliki nag³ówkowe i dokumentacja do biblioteki FOX
+Summary:       Header files for FOX library
+Summary(pl):   Pliki nag³ówkowe biblioteki FOX
 Group:         X11/Development/Libraries
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{release}
+Requires:      OpenGL-devel
+Requires:      bzip2-devel
+Requires:      libjpeg-devel
+Requires:      libpng-devel
+Requires:      libstdc++-devel
+Requires:      libtiff-devel
+Requires:      xcursor-devel
 
 %description devel
-Header files and development documentation for the FOX library.
+Header files for FOX library.
 
 %description devel -l pl
-Pliki nag³ówkowe i dokumentacja programisty do biblioteki FOX.
+Pliki nag³ówkowe biblioteki FOX.
 
 %package static
 Summary:       FOX static libraries
 Summary(pl):   Biblioteki statyczne FOX
 Group:         X11/Development/Libraries
-Requires:      %{name}-devel = %{version}
+Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
 FOX static libraries.
@@ -72,31 +86,44 @@ FOX static libraries.
 %description static -l pl
 Biblioteki statyczne FOX.
 
+%package doc
+Summary:       Development documentation for FOX library
+Summary(pl):   Dokumentacja programisty do biblioteki FOX
+Group:         X11/Development/Libraries
+
+%description doc
+Development documentation for FOX library.
+
+%description doc -l pl
+Dokumentacja programisty do biblioteki FOX.
+
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
-rm -f missing
-libtoolize -c -f
-aclocal
+%{__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}
 
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT
 
-cp -p pathfinder/.libs/PathFinder $RPM_BUILD_ROOT%{_bindir}
+ln -sf libFOX-1.6.so $RPM_BUILD_ROOT%{_libdir}/libFOX.so
 
-gzip -9nf ADDITIONS AUTHORS README TRACING
+rm -f doc/Makefile* doc/*/Makefile*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -106,23 +133,31 @@ 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
+%attr(755,root,root) %{_bindir}/Adie.stx
+%{_mandir}/man1/*
 
 %files devel
 %defattr(644,root,root,755)
-%doc *.gz doc
+%doc ADDITIONS TRACING
+%attr(755,root,root) %{_bindir}/fox-config
 %attr(755,root,root) %{_bindir}/reswrap
 %attr(755,root,root) %{_libdir}/lib*.so
-%attr(755,root,root) %{_libdir}/lib*.la
-%{_mandir}/man1/*
-%{_includedir}/fox
+%{_libdir}/lib*.la
+%{_includedir}/fox-1.6
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/lib*.a
+
+%files doc
+%defattr(644,root,root,755)
+%doc doc/*