Mercurial Mercurial > upstream > spec-files-extra / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
SFEfltk2.spec: bump to 7513
authorjurikm
Sat, 12 Jun 2010 21:51:53 +0000
changeset 2776 1329c739a5b7
parent 2775 7046a81d24a3
child 2777 b109c9569eaf
SFEfltk2.spec: bump to 7513
ChangeLog file | annotate | diff | comparison | revisions
SFEfltk2.spec file | annotate | diff | comparison | revisions
patches/fltk2-01-scandir.diff file | annotate | diff | comparison | revisions
patches/fltk2-02-lX11.diff file | annotate | diff | comparison | revisions
patches/fltk2-04-fltk2-config.diff file | annotate | diff | comparison | revisions
patches/fltk2-05-destdir.diff file | annotate | diff | comparison | revisions
patches/fltk2-06-install.diff file | annotate | diff | comparison | revisions
patches/fltk2-07-soname.diff file | annotate | diff | comparison | revisions 
--- a/ChangeLog	Sat Jun 12 18:11:13 2010 +0000
+++ b/ChangeLog	Sat Jun 12 21:51:53 2010 +0000
@@ -9,6 +9,7 @@
 	* SFEgsl.spec: bump to 1.14, removing "finite" patch
 	* encumbered/SFElibmms.spec: moved to encumbered - several MS patents
 	* SFElibassuan.spec: bump to 2.0.0, make it shared only
+	* SFEfltk2.spec: bump to 7513
 
 2010-06-11 Albert Lee <[email protected]>
 
--- a/SFEfltk2.spec	Sat Jun 12 18:11:13 2010 +0000
+++ b/SFEfltk2.spec	Sat Jun 12 21:51:53 2010 +0000
@@ -5,23 +5,25 @@
 
 %include Solaris.inc
 
-%define src_name     fltk
+%define src_name	fltk
 
-Name:                SFEfltk2
-Summary:             A C++ user interface toolkit
-Version:             2.0.x-r6403
-Source:              ftp://ftp.easysw.com/pub/fltk/snapshots/fltk-%{version}.tar.bz2
-Patch1:		     fltk2-01-scandir.diff
-Patch2:		     fltk2-02-lX11.diff
-Patch3:		     fltk2-03-test.diff
-Patch4:		     fltk2-04-fltk2-config.diff
-Patch5:		     fltk2-05-destdir.diff
-Patch6:		     fltk2-06-install.diff
-SUNW_BaseDir:        %{_basedir}
-BuildRoot:           %{_tmppath}/%{name}-%{version}-build
+Name:		SFEfltk2
+Summary:	A C++ user interface toolkit
+Version:	2.0.x-r7513
+Source:		ftp://ftp.easysw.com/pub/%{src_name}/snapshots/%{src_name}-%{version}.tar.bz2
+URL:		http://www.fltk.org/
+License:	FLTK
+Group:		Development/Libraries
+Patch1:		fltk2-01-scandir.diff
+Patch3:		fltk2-03-test.diff
+Patch7:		fltk2-07-soname.diff
+SUNW_BaseDir:	%{_basedir}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
-BuildRequires: SUNWxwplt
-Requires: SUNWxwplt
+BuildRequires:	SUNWxwplt
+Requires:	SUNWxwplt
+BuildRequires:	SUNWxorg-mesa
+Requires:	SUNWxorg-mesa
 
 %package devel
 Summary:		 %{summary} - development files
@@ -32,11 +34,8 @@
 %prep
 %setup -q -n fltk-%{version}
 %patch1 -p1
-%patch2 -p1
 %patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
+%patch7 -p1
 
 %build
 
@@ -48,12 +47,15 @@
 X11LIB="-L/usr/X11/lib -R/usr/X11/lib"
 SFWLIB="-L/usr/SFW/lib -R/usr/SFW/lib"
 GNULIB="-L/usr/gnu/lib -R/usr/gnu/lib"
+EXTRALIB="-lXrender -lfontconfig"
 
 export CFLAGS="%optflags -I/usr/X11/include -I/usr/gnu/include"
-export LDFLAGS="%{_ldflags} $X11LIB $GNULIB"
+export LDFLAGS="%{_ldflags} $X11LIB $GNULIB $EXTRALIB"
+
 
 ./configure --prefix=%{_prefix}  \
             --mandir=%{_mandir} \
+            --disable-static \
 	    --enable-shared
 
 make -j$CPUS
@@ -75,6 +77,9 @@
 %dir %attr (0755, root, bin) %{_bindir}
 %{_bindir}/fluid2
 %{_libdir}
+%dir %attr(0755, root, sys) %{_datadir}
+%dir %attr(0755, root, bin) %{_mandir}
+%dir %attr(0755, root, bin) %{_mandir}/man1
 
 %files devel
 %defattr (-, root, bin)
@@ -82,8 +87,13 @@
 %{_bindir}/fltk2-config
 %dir %attr (0755, root, bin) %{_includedir}
 %{_includedir}/*
+%dir %attr(0755, root, sys) %{_datadir}
+%dir %attr(0755, root, bin) %{_mandir}
+%dir %attr(0755, root, bin) %{_mandir}/man3
 
 %changelog
+* Sat Jun 12 2010 - Milan Jurik
+- bump to 7513
 * Tue Oct 22 2008  - Pradhap Devarajan <pradhap (at) gmail.com>
 - Bump to 6403
 * Sat Jan 11 2008 - [email protected]
--- a/patches/fltk2-01-scandir.diff	Sat Jun 12 18:11:13 2010 +0000
+++ b/patches/fltk2-01-scandir.diff	Sat Jun 12 21:51:53 2010 +0000
@@ -1,19 +1,6 @@
-diff -ur fltk-2.0.x-r5783-orig/configure fltk-2.0.x-r5783/configure
---- fltk-2.0.x-r5783-orig/configure	2007-04-27 11:00:55.000000000 +0700
-+++ fltk-2.0.x-r5783/configure	2007-04-30 10:27:54.811506346 +0700
-@@ -5891,7 +5891,7 @@
- echo "${ECHO_T}$ac_cv_func_scandir" >&6
- if test $ac_cv_func_scandir = yes; then
- 
--    if test "$uname" = SunOS -o "$uname" = QNX; then
-+    if test "$uname" = QNX; then
-         { echo "$as_me:$LINENO: WARNING: Not using $uname scandir emulation function." >&5
- echo "$as_me: WARNING: Not using $uname scandir emulation function." >&2;}
-     else
-diff -ur fltk-2.0.x-r5783-orig/configure.in fltk-2.0.x-r5783/configure.in
---- fltk-2.0.x-r5783-orig/configure.in	2007-01-03 11:06:26.000000000 +0700
-+++ fltk-2.0.x-r5783/configure.in	2007-04-30 10:27:54.812151047 +0700
-@@ -324,7 +324,7 @@
+--- fltk-2.0.x-r7513/configure.in	Fri Jul 24 01:08:12 2009
++++ fltk-2.0.x-r7513-patch/configure.in	Sat Jun 12 20:56:38 2010
+@@ -327,7 +327,7 @@
  AC_CHECK_HEADER(sys/select.h,AC_DEFINE(HAVE_SYS_SELECT_H))
  AC_CHECK_HEADER(sys/stdtypes.h,AC_DEFINE(HAVE_SYS_SELECT_H))
  AC_CHECK_FUNC(scandir,[
@@ -22,13 +9,12 @@
          AC_MSG_WARN(Not using $uname scandir emulation function.)
      else
          AC_DEFINE(HAVE_SCANDIR)
-diff -ur fltk-2.0.x-r5783-orig/src/filename_list.cxx fltk-2.0.x-r5783/src/filename_list.cxx
---- fltk-2.0.x-r5783-orig/src/filename_list.cxx	2007-03-16 02:31:52.000000000 +0700
-+++ fltk-2.0.x-r5783/src/filename_list.cxx	2007-04-30 10:29:11.081498495 +0700
+--- fltk-2.0.x-r7513/src/filename_list.cxx	Fri Jul 24 01:08:12 2009
++++ fltk-2.0.x-r7513-patch/src/filename_list.cxx	Sat Jun 12 20:59:22 2010
 @@ -67,6 +67,9 @@
- #elif defined(__hpux) || defined(__CYGWIN__)
-   // HP-UX, Cygwin define the comparison function like this:
    int n = scandir(d, list, 0, (int(*)(const dirent **, const dirent **))sort);
+ #elif defined(__linux) || defined (__FreeBSD__) || defined (__NetBSD__)
+   int n = scandir(d, list, 0, (int(*)(const void*,const void*))sort);
 +#elif defined(sun)
 +  // Solaris
 +  int n = scandir(d, list, 0, (int(*)(const struct dirent **, const struct dirent **))sort);
--- a/patches/fltk2-02-lX11.diff	Sat Jun 12 18:11:13 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-diff -ur fltk-2.0.x-r5783-orig/configure fltk-2.0.x-r5783/configure
---- fltk-2.0.x-r5783-orig/configure	2007-04-27 11:00:55.000000000 +0700
-+++ fltk-2.0.x-r5783/configure	2007-04-30 10:19:04.250772711 +0700
-@@ -10141,7 +10141,7 @@
- echo "$as_me: WARNING: Ignoring libraries \"$X_PRE_LIBS\" requested by configure." >&2;}
- 	fi
- 
--	LIBS="$LIBS -lXext $X_EXTRA_LIBS"
-+	LIBS="$LIBS -lX11 -lXext $X_EXTRA_LIBS"
- 	CFLAGS="$CFLAGS$X_CFLAGS"
- 	CXXFLAGS="$CXXFLAGS$X_CFLAGS"
- 	LDFLAGS="$X_LIBS $LDFLAGS"
-diff -ur fltk-2.0.x-r5783-orig/configure.in fltk-2.0.x-r5783/configure.in
---- fltk-2.0.x-r5783-orig/configure.in	2007-01-03 11:06:26.000000000 +0700
-+++ fltk-2.0.x-r5783/configure.in	2007-04-30 10:19:22.143645754 +0700
-@@ -605,7 +605,7 @@
- 	    AC_MSG_WARN(Ignoring libraries \"$X_PRE_LIBS\" requested by configure.)
- 	fi
- 
--	LIBS="$LIBS -lXext $X_EXTRA_LIBS"
-+	LIBS="$LIBS -lX11 -lXext $X_EXTRA_LIBS"
- 	CFLAGS="$CFLAGS$X_CFLAGS"
- 	CXXFLAGS="$CXXFLAGS$X_CFLAGS"
- 	LDFLAGS="$X_LIBS $LDFLAGS"
--- a/patches/fltk2-04-fltk2-config.diff	Sat Jun 12 18:11:13 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-diff -ur fltk-2.0.x-r5783-orig/fltk2-config.in fltk-2.0.x-r5783/fltk2-config.in
---- fltk-2.0.x-r5783-orig/fltk2-config.in	2006-04-16 00:43:12.000000000 +0700
-+++ fltk-2.0.x-r5783/fltk2-config.in	2007-04-30 10:38:47.894989246 +0700
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- #
- # "$Id: fltk2-config.in 4958 2006-04-15 17:43:12Z fabien $"
- # 
-diff -ur fltk-2.0.x-r5783-orig/fluid/Makefile fltk-2.0.x-r5783/fluid/Makefile
---- fltk-2.0.x-r5783-orig/fluid/Makefile	2007-01-15 07:56:30.000000000 +0700
-+++ fltk-2.0.x-r5783/fluid/Makefile	2007-04-30 10:38:18.694352519 +0700
-@@ -132,7 +132,7 @@
- 	-$(MKDIR) $(DESTDIR)$(bindir)
- 	$(CP) $(FLUID) $(DESTDIR)$(bindir)/fluid2$(EXEEXT)
- 	$(STRIP) $(DESTDIR)$(bindir)/fluid2$(EXEEXT)
--	$(bindir)/fltk2-config --post $(DESTDIR)$(bindir)/fluid2$(EXEEXT)
-+	$(DESTDIR)$(bindir)/fltk2-config --post $(DESTDIR)$(bindir)/fluid2$(EXEEXT)
- 	$(CHMOD) 755 $(DESTDIR)$(bindir)/fluid2$(EXEEXT)
- 
- 
--- a/patches/fltk2-05-destdir.diff	Sat Jun 12 18:11:13 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-diff -ur fltk-2.0.x-r5783-orig/glut/Makefile fltk-2.0.x-r5783/glut/Makefile
---- fltk-2.0.x-r5783-orig/glut/Makefile	2007-01-07 14:23:21.000000000 +0700
-+++ fltk-2.0.x-r5783/glut/Makefile	2007-04-30 10:47:21.249181376 +0700
-@@ -97,21 +97,21 @@
- 
- install_static: static
- 	@echo "Installing static libraries..."
--	@mkdir -p $(libdir)
--	@rm -f $(libdir)/$(LIBNAME)_glut$(LIBEXT)
--	@cp $(LIBNAME) $(libdir)
--	@-chmod 644 $(libdir)/$(LIBNAME)_glut$(LIBEXT) 
-+	@mkdir -p $(DESTDIR)$(libdir)
-+	@rm -f $(DESTDIR)$(libdir)/$(LIBNAME)_glut$(LIBEXT)
-+	@cp $(DESTDIR)$(LIBNAME) $(libdir)
-+	@-chmod 644 $(DESTDIR)$(libdir)/$(LIBNAME)_glut$(LIBEXT) 
- 
- install_shared: shared
- 	@echo "Installing shared libraries..."
--	@rm -f $(libdir)/$(DLLIMPORTNAME)
--	@if [ -f "$(libdir)/$(DSOLIBglutNAME)$(DSOEXT)" ]; then rm -f $(libdir)/$(DSOLIBglutNAME)$(DSOEXT); fi
--	@if [ "$(DSOSHORTEXT)" ]; then rm -f $(libdir)/$(DSOLIBglutNAME)$(DSOSHORTEXT); fi
--	@if [ "$(DSO)$(DSOEXT)" ]; then cp $(DSO)$(DSOEXT) $(libdir); fi
--	@chmod 755 $(libdir)/$(DSOLIBglutNAME)$(DSOEXT)
-+	@rm -f $(DESTDIR)$(libdir)/$(DLLIMPORTNAME)
-+	@if [ -f "$(DESTDIR)$(libdir)/$(DSOLIBglutNAME)$(DSOEXT)" ]; then rm -f $(DESTDIR)$(libdir)/$(DSOLIBglutNAME)$(DSOEXT); fi
-+	@if [ "$(DSOSHORTEXT)" ]; then rm -f $(DESTDIR)$(libdir)/$(DSOLIBglutNAME)$(DSOSHORTEXT); fi
-+	@if [ "$(DSO)$(DSOEXT)" ]; then cp $(DSO)$(DSOEXT) $(DESTDIR)$(libdir); fi
-+	@chmod 755 $(DESTDIR)$(libdir)/$(DSOLIBglutNAME)$(DSOEXT)
- 	@if [ "$(DSOSHORTEXT)" ]; then \
--		ln -s $(DSOLIBglutNAME)$(DSOEXT) $(libdir)/$(DSOLIBglutNAME)$(DSOSHORTEXT); fi
--	@if [ -f "../lib/$(DLLIMPORTNAME)" ]; then cp ../lib/$(DLLIMPORTNAME) $(libdir); fi
-+		ln -s $(DSOLIBglutNAME)$(DSOEXT) $(DESTDIR)$(libdir)/$(DSOLIBglutNAME)$(DSOSHORTEXT); fi
-+	@if [ -f "../lib/$(DLLIMPORTNAME)" ]; then cp ../lib/$(DLLIMPORTNAME) $(DESTDIR)$(libdir); fi
- 
- install_programs:
- 
--- a/patches/fltk2-06-install.diff	Sat Jun 12 18:11:13 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-diff -ur fltk-2.0.x-r5783-orig/documentation/Makefile fltk-2.0.x-r5783/documentation/Makefile
---- fltk-2.0.x-r5783-orig/documentation/Makefile	2006-06-25 13:11:31.000000000 +0700
-+++ fltk-2.0.x-r5783/documentation/Makefile	2007-04-30 10:54:13.265954278 +0700
-@@ -42,11 +42,11 @@
- # 	$(CP) $(HTMLFILES) *.gif *.jpg index.html $(docdir)
- # 	$(CHMOD) 644 $(docdir)/*
- 	echo "Installing man pages in $(mandir)"
--	-$(MKDIR) -p $(DESTDIR)$(mandir)/man1
-+	-$(MKDIR) -p $(DESTDIR)$(mandir)/man1 ; \
- 	for file in $(MAN1FILES); do \
- 		$(CP) $$file $(DESTDIR)$(mandir)/man1/`basename $$file .man`.1; \
- 	done
--	-$(MKDIR) -p $(DESTDIR)$(mandir)/man3
-+	-$(MKDIR) -p $(DESTDIR)$(mandir)/man3 ; \
- 	for file in $(MAN3FILES); do \
- 		$(CP) $$file $(DESTDIR)$(mandir)/man3/`basename $$file .man`.3; \
- 	done
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/fltk2-07-soname.diff	Sat Jun 12 21:51:53 2010 +0000
@@ -0,0 +1,11 @@
+--- fltk-2.0.x-r7513/configure.in	2010-06-12 23:43:05.490257556 +0200
++++ fltk-2.0.x-r7513-patch/configure.in	2010-06-12 23:43:19.114680554 +0200
+@@ -158,7 +158,7 @@
+ 	    ;;
+ 
+ 	SunOS* | UNIX_S*)
+-	    DSOCOMMAND="\$(CXX) -h \$@ \$(LDLIBS) -G $DEBUGFLAG -o"
++	    DSOCOMMAND="\$(CXX) -h \$(@F) \$(LDLIBS) -G $DEBUGFLAG -o"
+ 	    if test "$libdir" != "/usr/lib"; then
+ 		    DSOLINK="-R$libdir"
+             fi
upstream/spec-files-extra