- updated to 1.3.2

- build html documentation from sources (BR doxygen)

diff --git a/fltk.spec b/fltk.spec
index f2f914c0c2d326f1ef9dff2bba7927f0570ade2c..ced057691c712d8492612b5eb89b042a678a9be4 100644 (file)
--- a/fltk.spec
+++ b/fltk.spec
@@ -8,20 +8,19 @@ Summary:      Fast Light Tool Kit
 Summary(pl.UTF-8):     FLTK - "lekki" X11 toolkit
 Summary(pt_BR.UTF-8):  Interface gráfica em C++ para X, OpenGL e Windows
 Name:          fltk
-Version:       1.3.0
-Release:       2
+Version:       1.3.2
+Release:       1
 License:       LGPL with amendments (see COPYING)
 Group:         X11/Libraries
-Source0:       http://ftp.easysw.com/pub/fltk/%{version}/%{name}-%{version}-source.tar.gz
-# Source0-md5: 44d5d7ba06afdd36ea17da6b4b703ca3
-Source1:       http://ftp.easysw.com/pub/fltk/%{version}/%{name}-%{version}-docs-html.tar.gz
-# Source1-md5: ee79155cffc211e1d70a3ad8d3f170ef
+Source0:       http://fltk.org/pub/fltk/%{version}/%{name}-%{version}-source.tar.gz
+# Source0-md5: 9f7e707d4fb7a5a76f0f9b73ff70623d
 Patch0:                %{name}-desktop.patch
 Patch1:                %{name}-1.3.0-as-needed.patch
 Patch2:                %{name}-link.patch
 URL:           http://www.fltk.org/
 %{?with_opengl:BuildRequires:  OpenGL-GLU-devel}
 BuildRequires: autoconf >= 2.50
+BuildRequires: doxygen
 BuildRequires: groff
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
@@ -150,7 +149,7 @@ FLTK games: Block Attack!, Checkers, or Sudoku on your computer.
 Gry FLTK: Atak Klocków!, Warcaby, Sudoku.
 
 %prep
-%setup -q -a1
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -168,6 +167,8 @@ Gry FLTK: Atak Klocków!, Warcaby, Sudoku.
        %{?with_xft:--enable-xft}
 
 %{__make}
+cd documentation
+%{__make} html
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -202,7 +203,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%doc fltk-%{version}/documentation/html/*.{html,jpg,png}
+%doc documentation/html/*.{html,jpg,png}
 %doc %{_datadir}/doc/%{name}
 %attr(755,root,root) %{_bindir}/fltk-config
 %attr(755,root,root) %{_bindir}/fluid