diff --git a/.cvsignore b/.cvsignore index e31ddfa..a642dfd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -fltk-1.1.10rc3-source.tar.bz2 +fltk-1.1.10-source.tar.bz2 diff --git a/fltk-1.1.10-pkgconfig_xft.patch b/fltk-1.1.10-pkgconfig_xft.patch new file mode 100644 index 0000000..a909d7c --- /dev/null +++ b/fltk-1.1.10-pkgconfig_xft.patch @@ -0,0 +1,32 @@ +diff -up fltk-1.1.10/configure.pkgconfig_xft fltk-1.1.10/configure +--- fltk-1.1.10/configure.pkgconfig_xft 2010-02-14 14:03:17.730616944 -0600 ++++ fltk-1.1.10/configure 2010-02-14 14:05:05.369368026 -0600 +@@ -11945,8 +11945,8 @@ fi + + + if test "x$FTCONFIG" != x; then +- CPPFLAGS="`$FTCONFIG --cflags` $CPPFLAGS" +- CXXFLAGS="`$FTCONFIG --cflags` $CXXFLAGS" ++ CPPFLAGS="`pkg-config xft --cflags` $CPPFLAGS" ++ CXXFLAGS="`pkg-config xft --cflags` $CXXFLAGS" + + if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then + { echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5 +@@ -12080,7 +12080,7 @@ if test "${ac_cv_lib_Xft_XftDrawCreate+s + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lXft $LIBS" ++LIBS="`pkg-config xft --libs` $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -12140,7 +12140,7 @@ if test $ac_cv_lib_Xft_XftDrawCreate = y + #define USE_XFT 1 + _ACEOF + +- LIBS="-lXft $LIBS" ++ LIBS="`pkg-config xft --libs` $LIBS" + fi + + fi diff --git a/fltk.spec b/fltk.spec index 5702008..d0d0d4d 100644 --- a/fltk.spec +++ b/fltk.spec @@ -1,12 +1,10 @@ %global arch %(arch 2>/dev/null || echo undefined) -%define pre rc3 - Summary: C++ user interface toolkit Name: fltk Version: 1.1.10 -Release: 0.1.%{pre}%{?dist} +Release: 1%{?dist} # see COPYING (or http://www.fltk.org/COPYING.php ) for exceptions details License: LGPLv2+ with exceptions @@ -31,6 +29,8 @@ Patch3: fltk-1.1.x-r5750-undefined.patch Patch4: fltk-1.1.9-rpath.patch Patch5: fltk-1.1.8-fluid_desktop.patch Patch7: fltk-1.1.9-scandir.patch +# use output of `pkg-config xft --libs` instead of just -lXft +Patch8: fltk-1.1.10-pkgconfig_xft.patch %if 0%{?rhel} > 4 || 0%{?fedora} > 4 BuildRequires: libICE-devel libSM-devel @@ -99,6 +99,7 @@ Requires: %{name}-devel = %{version}-%{release} %if 0%{?fedora} > 10 %patch7 -p1 -b .gcc44 %endif +%patch8 -p1 -b .pkgconfig_xft %build @@ -206,7 +207,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || : %{_mandir}/man1/fltk-config.1* %{_mandir}/man3/fltk.3* - %files static %defattr(-,root,root,-) %{_libdir}/libfltk.a @@ -225,6 +225,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || : %changelog +* Sun Feb 10 2010 Rex Dieter - 1.1.10-1 +- fltk-1.1.10 +- FTBFS fltk-1.1.10-0.1.rc3.fc13: ImplicitDSOLinking (#564877) + * Tue Dec 08 2009 Rex Dieter - 1.1.10-0.1.rc3 - fltk-1.1.10rc3 diff --git a/sources b/sources index 4705d60..dff7964 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9e90a57291e2edb1a82d1083a765c8e4 fltk-1.1.10rc3-source.tar.bz2 +a1765594bc427ff892e36089fe1fa672 fltk-1.1.10-source.tar.bz2