- fix against linking fluid libraries found in system instead of

  "fresh built" libraries form fltk sources
- fix ranlib path
- rel. 2

Changed files:
    fltk-link.patch -> 1.7
    fltk.spec -> 1.60

diff --git a/fltk-link.patch b/fltk-link.patch
index fb54a3242d06e8f59a3da31467e45759569c7714..3844406e21042d5a1b486220daabf7a360764afb 100644 (file)
--- a/fltk-link.patch
+++ b/fltk-link.patch
@@ -47,3 +47,48 @@
            if test "x$libdir" != "x/usr/lib"; then
                    DSOLINK="-Wl,-rpath,$libdir"
              fi
+-- fltk-1.1.8/makeinclude.in~  2008-03-28 22:31:50.280354265 +0100
++++ fltk-1.1.8/makeinclude.in  2008-03-28 22:31:55.920623903 +0100
+@@ -127,7 +127,7 @@
+ UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@
+ 
+ # Be quiet when building...
+-.SILENT:
++#.SILENT:
+ 
+ # Build commands and filename extensions...
+ .SUFFIXES:    .0 .1 .3 .6 .c .cxx .h .fl .man .o .z $(EXEEXT)
+--- fltk-1.1.8/src/Makefile~   2008-03-28 22:40:13.774424155 +0100
++++ fltk-1.1.8/src/Makefile    2008-03-28 22:46:26.665583815 +0100
+@@ -494,16 +494,16 @@
+       -$(INSTALL_DIR) $(DESTDIR)$(libdir)
+       -$(INSTALL_DIR) $(DESTDIR)$(bindir)
+       $(RM) $(DESTDIR)$(libdir)/$(LIBNAME)
++      $(RANLIB) $(LIBNAME)
++      $(RANLIB) $(FLLIBNAME)
++      $(RANLIB) $(IMGLIBNAME)
+       $(INSTALL_LIB) $(LIBNAME) $(DESTDIR)$(libdir)
+       $(INSTALL_LIB) $(FLLIBNAME) $(DESTDIR)$(libdir)
+       $(INSTALL_LIB) $(IMGLIBNAME) $(DESTDIR)$(libdir)
+-      $(RANLIB) $(DESTDIR)$(libdir)/$(LIBNAME)
+-      $(RANLIB) $(DESTDIR)$(libdir)/$(FLLIBNAME)
+       if test x$(GLLIBNAME) != x; then \
++              $(RANLIB) $(GLLIBNAME); \
+               $(INSTALL_LIB) $(GLLIBNAME) $(DESTDIR)$(libdir); \
+-              $(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBNAME); \
+       fi
+-      $(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBNAME)
+       if test x$(DSONAME) = xlibfltk.so.1.1; then\
+               $(RM) $(DESTDIR)$(libdir)/libfltk.so*;\
+               $(INSTALL_LIB) libfltk.so.1.1 $(DESTDIR)$(libdir); \
+--- fltk-1.1.8/configure.in~   2008-03-28 23:00:54.660412250 +0100
++++ fltk-1.1.8/configure.in    2008-03-28 23:15:59.012846871 +0100
+@@ -225,7 +225,7 @@
+           ;;
+     esac
+ 
+-    LINKSHARED="-L../src -lfltk_images$SHAREDSUFFIX -lfltk_forms$SHAREDSUFFIX -lfltk$SHAREDSUFFIX"
++    LINKSHARED="-l:../src/libfltk_images.so -l:../src/libfltk_forms.so -l:../src/libfltk.so"
+ else
+     DSOCOMMAND="echo"
+     DSOLINK=""

diff --git a/fltk.spec b/fltk.spec
index 9298dd64cf686d30b897bf934c8ca856bc3623b1..c4005f87dd5fae3f08588ab03ce1edbd4e96425b 100644 (file)
--- a/fltk.spec
+++ b/fltk.spec
@@ -8,7 +8,7 @@ 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.1.8
-Release:       1
+Release:       2
 License:       LGPL with amendments (see COPYING)
 Group:         X11/Libraries
 Source0:       http://ftp.easysw.com/pub/fltk/%{version}/%{name}-%{version}-source.tar.bz2
@@ -152,6 +152,7 @@ install %{SOURCE1} .
 %configure \
        --enable-shared \
        --with-x \
+       --with-optim="%{rpmcxxflags}" \
        %{!?with_opengl:--disable-gl} \
        %{?with_xft:--enable-xft}