--- a/ChangeLog Sun Sep 25 20:14:40 2011 +0000
+++ b/ChangeLog Sun Sep 25 20:28:39 2011 +0000
@@ -2,6 +2,7 @@
* SFEtumbler.spec: fix build
* SFEfltk2.spec: fix Sun Studio build
+ * SFEfltk.spec: bump to 1.3.0
2011-09-25 Ken Mays <[email protected]>
--- a/SFEfltk.spec Sun Sep 25 20:14:40 2011 +0000
+++ b/SFEfltk.spec Sun Sep 25 20:28:39 2011 +0000
@@ -7,18 +7,14 @@
Name: SFEfltk
Summary: A C++ user interface toolkit
-Version: 1.1.7
-Source: http://ftp.easysw.com/pub/fltk/%{version}/fltk-%{version}-source.tar.bz2
+Version: 1.3.0
+Source: http://ftp.easysw.com/pub/fltk/%{version}/fltk-%{version}-source.tar.gz
+Patch1: fltk-01-sunstudio.diff
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%include default-depend.inc
-%if %(pkginfo -q FSWxwrtl && echo 1 || echo 0)
-# using FOX
-Requires: FSWxwrtl
-%else
Requires: SUNWxwplt
BuildRequires: SUNWxwplt
-%endif
%package devel
Summary: %{summary} - development files
@@ -28,6 +24,7 @@
%prep
%setup -q -n fltk-%{version}
+%patch1 -p1
%build
@@ -36,14 +33,14 @@
CPUS=1
fi
-export CC=/usr/gcc/4.3/bin/gcc
-export CXX=/usr/gcc/4.3/bin/g++
-#export CFLAGS="%optflags"
-#export LDFLAGS="%{_ldflags}"
+export CFLAGS="%optflags"
+export LDFLAGS="%{_ldflags}"
./configure --prefix=%{_prefix} \
--mandir=%{_mandir} \
- --enable-shared
+ --enable-shared \
+ --enable-cairo \
+ --enable-cairoext
make -j$CPUS
@@ -86,6 +83,8 @@
%{_mandir}/man3/*
%changelog
+* Sun Sep 25 2011 - Milan Jurik
+- bump to 1.3.0
* Sat Oct 13 2007 - [email protected]
- add FOX build support
* Wed Oct 11 2006 - [email protected]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/fltk-01-sunstudio.diff Sun Sep 25 20:28:39 2011 +0000
@@ -0,0 +1,5 @@
+--- fltk-1.3.0/test/unittests.cxx 2011-09-25 22:18:45.751241257 +0200
++++ fltk-1.3.0/test/unittests.cxx 2011-09-25 22:18:40.342993673 +0200
+@@ -103 +103 @@
+-UnitTest *UnitTest::fTest[];
++UnitTest *UnitTest::fTest[200];