rpms/k3d/F-7 k3d-0.6.6.0-vfs.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 k3d-0.5.15.0-gl64.patch, 1.1, 1.2 k3d.spec, 1.13, 1.14 sources, 1.9, 1.10 k3d-0.6.5.0-py25.patch, 1.1, NONE k3d-0.6.5.0-viewport.patch, 1.1, NONE

[Denis Leroy (denis)]

Author: denis

Update of /cvs/pkgs/rpms/k3d/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17802

Modified Files:
	.cvsignore k3d-0.5.15.0-gl64.patch k3d.spec sources 
Added Files:
	k3d-0.6.6.0-vfs.patch 
Removed Files:
	k3d-0.6.5.0-py25.patch k3d-0.6.5.0-viewport.patch 
Log Message:
- Update to 0.6.6.0
- Removed patches that moved upstream
- Added gnome-vfs2-devel, fixed gnome-vfs2 missing config
- Fixed lib64 script to avoid autoreconf
- Added aqsis dependency


k3d-0.6.6.0-vfs.patch:

--- NEW FILE k3d-0.6.6.0-vfs.patch ---
--- k3d-0.6.6.0/configure.orig	2007-06-06 16:23:15.000000000 +0200
+++ k3d-0.6.6.0/configure	2007-06-06 16:44:10.000000000 +0200
@@ -21108,8 +21108,8 @@
 	if pkg-config --exists libgnome-2.0 >/dev/null 2>/dev/null; then
 		K3D_GNOME_SUBDIR=gnome
 		K3D_GNOME_VERSION=`pkg-config --modversion libgnome-2.0`
-		K3D_GNOME_CPPFLAGS=`pkg-config --cflags libgnome-2.0`
-		K3D_GNOME_LIBS=`pkg-config --libs libgnome-2.0`
+		K3D_GNOME_CPPFLAGS=`pkg-config --cflags libgnome-2.0 gnome-vfs-2.0`
+		K3D_GNOME_LIBS=`pkg-config --libs libgnome-2.0 gnome-vfs-2.0`
 		{ echo "$as_me:$LINENO: result: found version $K3D_GNOME_VERSION" >&5
 echo "${ECHO_T}found version $K3D_GNOME_VERSION" >&6; }
 	else


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/k3d/F-7/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	29 Dec 2006 08:39:47 -0000	1.9
+++ .cvsignore	6 Jun 2007 17:12:24 -0000	1.10
@@ -1 +1 @@
-k3d-0.6.5.0-src.tar.bz2
+k3d-0.6.6.0-src.tar.bz2

k3d-0.5.15.0-gl64.patch:

Index: k3d-0.5.15.0-gl64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/k3d/F-7/k3d-0.5.15.0-gl64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- k3d-0.5.15.0-gl64.patch	11 Aug 2006 07:39:24 -0000	1.1
+++ k3d-0.5.15.0-gl64.patch	6 Jun 2007 17:12:24 -0000	1.2
@@ -1,7 +1,7 @@
---- m4/k3d_check_opengl.m4~	2006-05-01 03:02:21.000000000 -0700
-+++ m4/k3d_check_opengl.m4	2006-07-25 22:37:27.000000000 -0700
-@@ -8,7 +8,7 @@
- AC_MSG_CHECKING([for OpenGL])
+--- k3d-0.6.6.0/configure.orig	2007-06-06 16:23:15.000000000 +0200
++++ k3d-0.6.6.0/configure	2007-06-06 16:24:14.000000000 +0200
+@@ -20382,7 +20382,7 @@
+ echo $ECHO_N "checking for OpenGL... $ECHO_C" >&6; }
  
  k3d_check_opengl_lib_dir=""
 -k3d_check_opengl_directories="/usr/lib /usr/local/lib /usr/X11R6/lib"
@@ -9,10 +9,8 @@
  for k3d_check_opengl_directory in $k3d_check_opengl_directories; do
  	if test -f $k3d_check_opengl_directory/libGL.so || test -f $k3d_check_opengl_directory/libGL.a || test -f $k3d_check_opengl_directory/libGL.dll.a; then
  		k3d_check_opengl_lib_dir=$k3d_check_opengl_directory
---- m4/k3d_check_opengl.m4~	2006-07-25 22:37:27.000000000 -0700
-+++ m4/k3d_check_opengl.m4	2006-07-25 22:53:40.000000000 -0700
-@@ -42,7 +42,7 @@
- AC_MSG_CHECKING([for OpenGLU])
+@@ -20416,7 +20416,7 @@
+ echo $ECHO_N "checking for OpenGLU... $ECHO_C" >&6; }
  
  k3d_check_openglu_lib_dir=""
 -k3d_check_openglu_directories="/usr/lib /usr/local/lib /usr/X11R6/lib"


Index: k3d.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3d/F-7/k3d.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- k3d.spec	29 Dec 2006 08:39:47 -0000	1.13
+++ k3d.spec	6 Jun 2007 17:12:24 -0000	1.14
@@ -1,6 +1,6 @@
 
 Name:           k3d
-Version:        0.6.5.0
+Version:        0.6.6.0
 Release:        1%{?dist}
 Summary:        A 3D Modeling, Animation and Rendering System
 
@@ -9,10 +9,11 @@
 URL:            http://www.k-3d.org/
 Source0:        http://dl.sourceforge.net/k3d/k3d-%{version}-src.tar.bz2
 Patch0:         k3d-0.5.15.0-gl64.patch
-Patch1:         k3d-0.6.5.0-py25.patch
-Patch2:         k3d-0.6.5.0-viewport.patch
+Patch1:         k3d-0.6.6.0-vfs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Requires:       aqsis
+
 BuildRequires:  desktop-file-utils
 BuildRequires:  mesa-libGL-devel
 BuildRequires:  expat-devel
@@ -23,6 +24,7 @@
 BuildRequires:  freetype-devel
 BuildRequires:  python-devel
 BuildRequires:  libgnome-devel
+BuildRequires:  gnome-vfs2-devel
 BuildRequires:  OpenEXR-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  ImageMagick-c++-devel
@@ -31,7 +33,7 @@
 BuildRequires:  gts-devel
 BuildRequires:  librsvg2
 BuildRequires:  bzip2-devel
-BuildRequires:  autoconf automake libtool
+BuildRequires:  libtool
 
 Requires(post):   /sbin/ldconfig
 Requires(post):   desktop-file-utils
@@ -69,13 +71,11 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .gl64
-%patch1 -p1 -b .py25
-%patch2 -p1 -b .viewport
+%patch0 -p1 -b .gl64
+%patch1 -p1 -b .vfs
 
 
 %build
-autoreconf
 %configure --disable-static --with-external-boost
 make %{?_smp_mflags}
 
@@ -156,6 +156,13 @@
 
 
 %changelog
+* Wed May 30 2007 Denis Leroy <denis at poolshark.org> - 0.6.6.0-1
+- Update to 0.6.6.0
+- Removed patches that moved upstream
+- Added gnome-vfs2-devel, fixed gnome-vfs2 missing config
+- Fixed lib64 script to avoid autoreconf
+- Added aqsis dependency
+
 * Fri Dec 29 2006 Denis Leroy <denis at poolshark.org> - 0.6.5.0-1
 - Update to 0.6.5.0
 - Added patch to fix x86_64 startup crash in viewport widget


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/k3d/F-7/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	29 Dec 2006 08:39:47 -0000	1.9
+++ sources	6 Jun 2007 17:12:24 -0000	1.10
@@ -1 +1 @@
-61ef7955c2a6e77e96e2e0161873be7f  k3d-0.6.5.0-src.tar.bz2
+2f140db3cf9be02a5da64645a9ea5dcd  k3d-0.6.6.0-src.tar.bz2


--- k3d-0.6.5.0-py25.patch DELETED ---


--- k3d-0.6.5.0-viewport.patch DELETED ---