Author: anssi
Date: Tue Jan 30 22:39:24 2007
New Revision: 115602
Added:
packages/cooker/k3d/current/SOURCES/k3d-0.6.6.0-configure-libdir.patch
packages/cooker/k3d/current/SOURCES/k3d-0.6.6.0-gui-in-pkglibdir.patch
Removed:
packages/cooker/k3d/current/SOURCES/k3d-configure.patch
Modified:
packages/cooker/k3d/current/SPECS/k3d.spec
Log:
- patch2: move gui libs to pkglibdir (.so is dlopened)
Added: packages/cooker/k3d/current/SOURCES/k3d-0.6.6.0-configure-libdir.patch
==============================================================================
--- (empty file)
+++ packages/cooker/k3d/current/SOURCES/k3d-0.6.6.0-configure-libdir.patch
Tue Jan 30 22:39:24 2007
@@ -0,0 +1,21 @@
+diff -Nurp -x '*~' k3d-0.6.6.0/m4/k3d_check_opengl.m4
k3d-0.6.6.0-a/m4/k3d_check_opengl.m4
+--- k3d-0.6.6.0/m4/k3d_check_opengl.m4 2006-05-01 13:02:21.000000000 +0300
++++ k3d-0.6.6.0-a/m4/k3d_check_opengl.m4 2007-01-30 21:41:43.000000000
+0200
+@@ -8,7 +8,7 @@ AC_SUBST(K3D_OPENGL_LIBS)
+ AC_MSG_CHECKING([for OpenGL])
+
+ k3d_check_opengl_lib_dir=""
+-k3d_check_opengl_directories="/usr/lib /usr/local/lib /usr/X11R6/lib"
++k3d_check_opengl_directories=${libdir}
+ 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
+@@ -42,7 +42,7 @@ AC_SUBST(K3D_OPENGLU_LIBS)
+ AC_MSG_CHECKING([for OpenGLU])
+
+ k3d_check_openglu_lib_dir=""
+-k3d_check_openglu_directories="/usr/lib /usr/local/lib /usr/X11R6/lib"
++k3d_check_openglu_directories=${libdir}
+ for k3d_check_openglu_directory in $k3d_check_openglu_directories; do
+ if test -f $k3d_check_openglu_directory/libGLU.so || test -f
$k3d_check_openglu_directory/libGLU.a || test -f
$k3d_check_openglu_directory/libGLU.dll.a; then
+ k3d_check_openglu_lib_dir=$k3d_check_openglu_directory
Added: packages/cooker/k3d/current/SOURCES/k3d-0.6.6.0-gui-in-pkglibdir.patch
==============================================================================
--- (empty file)
+++ packages/cooker/k3d/current/SOURCES/k3d-0.6.6.0-gui-in-pkglibdir.patch
Tue Jan 30 22:39:24 2007
@@ -0,0 +1,32 @@
+diff -Nurp -x '*~' k3d-0.6.6.0/application/k3d.in
k3d-0.6.6.0-f/application/k3d.in
+--- k3d-0.6.6.0/application/k3d.in 2006-09-08 03:34:44.000000000 +0300
++++ k3d-0.6.6.0-f/application/k3d.in 2007-01-30 21:36:46.000000000 +0200
+@@ -28,8 +28,8 @@ k3d_default_plugins=$pkglibdir
+ k3d_default_shader_cache=~/.k3d/shadercache
+ k3d_default_share=$pkgdatadir
+ k3d_default_tutorials=$pkgdatadir/tutorials
+-k3d_default_user_interface=$libdir/libk3dngui.so
+-k3d_null_user_interface=$libdir/libk3dnui.so
++k3d_default_user_interface=$pkglibdir/libk3dngui.so
++k3d_null_user_interface=$pkglibdir/libk3dnui.so
+
+ #####################################################
+ # Setup paths that can be overridden ...
+diff -Nurp -x '*~' k3d-0.6.6.0/ngui/Makefile.am k3d-0.6.6.0-f/ngui/Makefile.am
+--- k3d-0.6.6.0/ngui/Makefile.am 2007-01-01 09:35:13.000000000 +0200
++++ k3d-0.6.6.0-f/ngui/Makefile.am 2007-01-30 21:38:55.000000000 +0200
+@@ -1,4 +1,4 @@
+-lib_LTLIBRARIES = libk3dngui.la
++pkglib_LTLIBRARIES = libk3dngui.la
+
+ libk3dngui_la_SOURCES = \
+ about_box.cpp \
+diff -Nurp -x '*~' k3d-0.6.6.0/nui/Makefile.am k3d-0.6.6.0-f/nui/Makefile.am
+--- k3d-0.6.6.0/nui/Makefile.am 2004-10-06 09:49:40.000000000 +0300
++++ k3d-0.6.6.0-f/nui/Makefile.am 2007-01-30 21:38:43.000000000 +0200
+@@ -1,4 +1,4 @@
+-lib_LTLIBRARIES = libk3dnui.la
++pkglib_LTLIBRARIES = libk3dnui.la
+
+ libk3dnui_la_SOURCES = \
+ user_interface.cpp
Modified: packages/cooker/k3d/current/SPECS/k3d.spec
==============================================================================
--- packages/cooker/k3d/current/SPECS/k3d.spec (original)
+++ packages/cooker/k3d/current/SPECS/k3d.spec Tue Jan 30 22:39:24 2007
@@ -10,7 +10,10 @@
Url: http://k3d.sourceforge.net/new/
Source:
http://downloads.sourceforge.net/k3d/%{name}-%{version}-src.tar.bz2
Patch0: %{name}-desktop.patch
-Patch1: %{name}-configure.patch
+Patch1: k3d-0.6.6.0-configure-libdir.patch
+# move guilib to %{_libdir}/%{name} as we need the .so, and we can't have .so
+# symlinks in %{_libdir}
+Patch2: k3d-0.6.6.0-gui-in-pkglibdir.patch
BuildRequires: gtkmm2.4-devel
BuildRequires: libboost-devel
BuildRequires: mesa-common-devel
@@ -76,10 +79,13 @@
%prep
%setup -q %{name}-%{version}
%patch0 -p0
-%patch1 -p0
+%patch1 -p1
+%patch2 -p1
%build
-
+aclocal -I m4
+autoconf
+automake
%configure2_5x \
--enable-shared \
--enable-static \
@@ -172,6 +178,7 @@
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/*.so.%{major}*
%attr(755,root,root) %{_libdir}/%{name}/*.so.%{major}*
+%{_libdir}/%{name}/*.so
%files -n %{libname}-devel
%defattr(644,root,root,755)
@@ -180,10 +187,7 @@
%{_libdir}/*.la
%{_libdir}/*.so
%{_libdir}/%{name}/*.la
-%{_libdir}/%{name}/*.so
-%dir %{_includedir}/k3d
-%{_includedir}/%{name}/Hapy/*
-%{_includedir}/%{name}/k3dsdk/*
+%{_includedir}/k3d
%files -n %{libname}-static-devel
%defattr(644,root,root,755)
