From 222547698d097dea916f4c78266ebb638a09e38d Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Wed, 13 Dec 2006 15:45:05 +0000
Subject: [PATCH] - fltk-1.1.x-r5555 snapshot, for 64bit issues (#219348) -
 restore static libs (they're tightly coupled with fltk-config) - cleanup
 %description's

---
 .cvsignore            |  1 +
 fltk-1.1.7-test.patch |  2 +-
 fltk.spec             | 65 +++++++++++++++++++++++++++----------------
 sources               |  2 +-
 4 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index fa4dc85..5e34cef 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 fltk-1.1.7-source.tar.bz2
+fltk-1.1.x-r5555.tar.bz2
diff --git a/fltk-1.1.7-test.patch b/fltk-1.1.7-test.patch
index 3122f54..d36ec76 100644
--- a/fltk-1.1.7-test.patch
+++ b/fltk-1.1.7-test.patch
@@ -14,7 +14,7 @@
  	done
  
 +test:	
-+	(cd test;; $(MAKE) $(MFLAGS)) ||:
++	(cd test;; $(MAKE) $(MFLAGS)) || exit 1
 +
  install: makeinclude
  	-mkdir -p $(DESTDIR)$(bindir)
diff --git a/fltk.spec b/fltk.spec
index c0f7f62..887fa6a 100644
--- a/fltk.spec
+++ b/fltk.spec
@@ -1,13 +1,20 @@
 
+%define snap    r5555
+#define _disable_static --disable-static
+
 Summary:	C++ user interface toolkit
 Name:		fltk
 Version:	1.1.7
-Release:	6%{?dist}
+Release:	7.%{snap}%{?dist}
 
 License:	LGPL with exceptions
 Group:		System Environment/Libraries
 URL:		http://www.fltk.org/
+%if "%{?snap:1}" == "1"
+Source0:        ftp://ftp.easysw.com/pub/fltk/snapshots/fltk-1.1.x-%{snap}.tar.bz2
+%else
 Source0:        http://ftp.easysw.com/pub/fltk/%{version}/%{name}-%{version}-source.tar.bz2
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # See http://bugzilla.redhat.com/199656
@@ -29,8 +36,14 @@ BuildRequires:  pkgconfig
 BuildRequires:  desktop-file-utils
 BuildRequires:	man
 
+%description
+FLTK (pronounced "fulltick") is a cross-platform C++ GUI toolkit.
+It provides modern GUI functionality without the bloat, and supports
+3D graphics via OpenGL and its built-in GLUT emulation.
+
+
 %package devel
-Summary:	Development package for %{name}
+Summary:	Development files for %{name}
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	libstdc++-devel
@@ -41,36 +54,27 @@ Requires:       libX11-devel libSM-devel libICE-devel
 %else
 Requires:       xorg-x11-devel
 %endif
+%description devel
+%{summary}.
 
 %package fluid
 Summary:	Fast Light User Interface Designer
 Group:		Development/Tools
 Requires:	%{name}-devel = %{version}-%{release}
-
-%description
-FLTK (pronounced "fulltick") is a cross-platform C++ GUI toolkit for
-UNIX/Linux (X11), Microsoft Windows, and Mac OS X. It provides modern
-GUI functionality without the bloat, and supports 3D graphics via
-OpenGL and its built-in GLUT emulation. FLTK is designed to be small
-and modular enough to be statically linked, and also works fine as a
-shared library.
-
-%description devel
-This package contains development files for %{name}
-FLTK (pronounced "fulltick") is a cross-platform C++ GUI toolkit for
-UNIX/Linux (X11), Microsoft Windows, and Mac OS X. It provides modern
-GUI functionality without the bloat, and supports 3D graphics via
-OpenGL and its built-in GLUT emulation.
-
 %description fluid
-fluid stands for the Fast Light User Interface Designer. It is an
-interactive GUI designer for FLTK.
+%{summary}, an interactive GUI designer for %{name}. 
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?extraversion}
+%if "%{?snap:1}" == "1"
+%setup -q -n fltk-1.1.x-%{snap}
+%else
+%setup -q 
+%endif
 
+%if "%{?snap:1}" != "1"
 %patch1 -p1 -b .199656
+%endif
 %patch2 -p1 -b .test
 
 
@@ -79,7 +83,7 @@ export CPPFLAGS="$(pkg-config xft --cflags)"
 export LDFLAGS="$(pkg-config xft --libs)"
 
 %configure \
-  --disable-static \
+  %{?_disable_static} \
   --enable-shared \
   --enable-threads \
   --enable-xdbe \
@@ -106,11 +110,13 @@ mv $RPM_BUILD_ROOT%{_docdir}/fltk __docs
 ## unpackaged files
 # errant docs
 rm -rf $RPM_BUILD_ROOT%{_mandir}/cat*
+%if "%{?_disable_static:1}" == "1"
 # static libs
 rm -f  $RPM_BUILD_ROOT%{_libdir}/lib*.a
-# games: checkers/sudoku
+%endif
+# omit examples/games: 
 make -C test uninstall-linux DESTDIR=$RPM_BUILD_ROOT
-rm -f  $RPM_BUILD_ROOT%{_mandir}/man?/{sudoku,checkers}*
+rm -f  $RPM_BUILD_ROOT%{_mandir}/man?/{blocks,checkers,sudoku}*
 
 
 %check
@@ -154,6 +160,12 @@ update-desktop-database >& /dev/null ||:
 %{_libdir}/libfltk_forms.so
 %{_libdir}/libfltk_gl.so
 %{_libdir}/libfltk_images.so
+%if "%{?_disable_static:1}" != "1"
+%{_libdir}/libfltk.a
+%{_libdir}/libfltk_forms.a
+%{_libdir}/libfltk_gl.a
+%{_libdir}/libfltk_images.a
+%endif
 %{_mandir}/man1/fltk-config.1*
 %{_mandir}/man3/fltk.3*
 
@@ -168,6 +180,11 @@ update-desktop-database >& /dev/null ||:
 
 
 %changelog
+* Wed Dec 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.1.7-7.r5555
+- fltk-1.1.x-r5555 snapshot, for 64bit issues (#219348)
+- restore static libs (they're tightly coupled with fltk-config)
+- cleanup %%description's
+
 * Mon Dec 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.1.7-6
 - move tests to %%check section
 
diff --git a/sources b/sources
index 3d8f3e2..eeeaaf2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2e29319119adc9d63b2f26b72cae0a88  fltk-1.1.7-source.tar.bz2
+4dea63e0e947950b446f955555cd47c9  fltk-1.1.x-r5555.tar.bz2