- fltk-1.1.10rc3

.cvsignore

@@ -1 +1 @@
-fltk-1.1.9-source.tar.bz2
+fltk-1.1.10rc3-source.tar.bz2

fltk-1.1.9-consts.patch

@@ -1,20 +0,0 @@
-diff -ru fltk-1.1.9.orig/src/fl_set_fonts_xft.cxx fltk-1.1.9/src/fl_set_fonts_xft.cxx
---- fltk-1.1.9.orig/src/fl_set_fonts_xft.cxx	2009-03-04 10:58:49.000000000 +0000
-+++ fltk-1.1.9/src/fl_set_fonts_xft.cxx	2009-03-04 11:01:25.000000000 +0000
-@@ -253,13 +253,13 @@
-       // So the bit we want is up to the first comma - BUT some strings have
-       // more than one name, separated by, guess what?, a comma...
-       stop = start = first = 0;
--      stop = strchr((const char *)font, ',');
--      start = strchr((const char *)font, ':');
-+      stop = strchr((char *)font, ',');
-+      start = strchr((char *)font, ':');
-       if ((stop) && (start) && (stop < start))
-       {
-         first = stop + 1; // discard first version of name
-         // find first comma *after* the end of the name
--        stop = strchr((const char *)start, ',');
-+        stop = strchr((char *)start, ',');
-       }
-       else
-       {

fltk-1.1.9-rpath.patch

@@ -8,9 +8,9 @@ diff -up fltk-1.1.9/configure.in.rpath fltk-1.1.9/configure.in
 -	    if test "x$libdir" != "x/usr/lib"; then
 -		    DSOLINK="-Wl,-rpath,$libdir"
 -            fi
-+#	    if test "x$libdir" != "x/usr/lib"; then
-+#		    DSOLINK="-Wl,-rpath,$libdir"
-+#	    fi
++	    if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/usr/lib32" -a "x$libdir" != "x/usr/lib64"; then
++		    DSOLINK="-Wl,-rpath,$libdir"
++	    fi
  	    ;;
  	AIX*)
              DSONAME="libfltk_s.a"

fltk.spec

@@ -1,10 +1,12 @@
 
 %global arch %(arch 2>/dev/null || echo undefined)
 
+%define pre rc3
+
 Summary:	C++ user interface toolkit
 Name:		fltk
-Version:	1.1.9
-Release:	7%{?dist}
+Version:	1.1.10
+Release:	0.1.%{pre}%{?dist}
 
 # see COPYING (or http://www.fltk.org/COPYING.php ) for exceptions details
 License:	LGPLv2+ with exceptions	
@@ -13,7 +15,8 @@ URL:		http://www.fltk.org/
 %if "%{?snap:1}" == "1"
 Source0:        http://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
+Source0:        http://ftp.easysw.com/pub/fltk/%{version}%{?pre}/%{name}-%{version}%{?pre}-source.tar.bz2
+#Source0:         http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/1.1.10rc3/fltk-1.1.10rc3-source.tar.bz2
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -27,8 +30,7 @@ Patch3: 	fltk-1.1.x-r5750-undefined.patch
 # nuke --rpath (#238284)
 Patch4: 	fltk-1.1.9-rpath.patch
 Patch5: 	fltk-1.1.8-fluid_desktop.patch
-Patch6: 	fltk-1.1.9-consts.patch
-Patch7:         fltk-1.1.9-gcc44.patch
+Patch7:         fltk-1.1.9-scandir.patch
 
 %if 0%{?rhel} > 4 || 0%{?fedora} > 4
 BuildRequires:  libICE-devel libSM-devel
@@ -85,7 +87,7 @@ Requires:	%{name}-devel = %{version}-%{release}
 %if "%{?snap:1}" == "1"
 %setup -q -n fltk-1.1.x-%{snap}
 %else
-%setup -q 
+%setup -q  -n fltk-%{version}%{?pre}
 %endif
 
 %patch1 -p1 -b .fltk_config
@@ -93,7 +95,6 @@ Requires:	%{name}-devel = %{version}-%{release}
 %patch3 -p1 -b .undefined
 %patch4 -p1 -b .rpath
 %patch5 -p1 -b .fluid_desktop
-%patch6 -p1 -b .consts
 # FIXME, why only needed for F-11+/gcc44 ?
 %if 0%{?fedora} > 10
 %patch7 -p1 -b .gcc44
@@ -156,7 +157,7 @@ rm -rf $RPM_BUILD_ROOT%{_mandir}/cat*
 
 %check
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/fluid.desktop
-make test 
+make -C test 
 
 
 %clean
@@ -224,6 +225,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 
 %changelog
+* Tue Dec 08 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.1.10-0.1.rc3
+- fltk-1.1.10rc3
+
 * Mon Dec 07 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.1.9-7
 - real -static subpkg (#545145)
 

sources

@@ -1 +1 @@
-e146fd264e1001b1313acfd41ef75552  fltk-1.1.9-source.tar.bz2
+9e90a57291e2edb1a82d1083a765c8e4  fltk-1.1.10rc3-source.tar.bz2