rpms/k3d/devel k3d-0.7.10.0-fontpath.patch, NONE, 1.1 k3d-0.7.10.0-potfiles.patch, NONE, 1.1 k3d-0.7.10.0-warn.patch, NONE, 1.1 k3d.desktop, NONE, 1.1 .cvsignore, 1.10, 1.11 k3d.spec, 1.26, 1.27 sources, 1.10, 1.11 k3d-0.5.15.0-gl64.patch, 1.2, NONE k3d-0.6.6.0-vfs.patch, 1.1, NONE k3d-0.6.7.0-desktop.patch, 1.1, NONE k3d-0.6.7.0-gcc43.patch, 1.2, NONE k3d-0.6.7.0-sigc2.patch, 1.1, NONE
Denis Leroy
denis at fedoraproject.org
Tue Mar 10 09:28:31 UTC 2009
Author: denis
Update of /cvs/pkgs/rpms/k3d/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25204
Modified Files:
.cvsignore k3d.spec sources
Added Files:
k3d-0.7.10.0-fontpath.patch k3d-0.7.10.0-potfiles.patch
k3d-0.7.10.0-warn.patch k3d.desktop
Removed Files:
k3d-0.5.15.0-gl64.patch k3d-0.6.6.0-vfs.patch
k3d-0.6.7.0-desktop.patch k3d-0.6.7.0-gcc43.patch
k3d-0.6.7.0-sigc2.patch
Log Message:
- Update to upstream 0.7.10.0
- Build system now based on cmake
- All patches upstreamed or obsoleted
- Added potfiles file list patch fix
- Removed example subpackage
- Removed packaged bitstream fonts, use Fedora ones instead
k3d-0.7.10.0-fontpath.patch:
--- NEW FILE k3d-0.7.10.0-fontpath.patch ---
diff -ur k3d-source-0.7.10.0.orig/modules/annotation/annotation_2d.cpp k3d-source-0.7.10.0/modules/annotation/annotation_2d.cpp
--- k3d-source-0.7.10.0.orig/modules/annotation/annotation_2d.cpp 2008-12-14 22:03:53.000000000 +0100
+++ k3d-source-0.7.10.0/modules/annotation/annotation_2d.cpp 2009-03-10 09:29:17.000000000 +0100
@@ -57,7 +57,7 @@
public:
annotation_2d(k3d::iplugin_factory& Factory, k3d::idocument& Document) :
base(Factory, Document),
- m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("fonts/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())),
+ m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())),
m_font_size(init_owner(*this) + init_name("font_size") + init_label(_("Font Size")) + init_description(_("Font size.")) + init_value(14.0)),
m_line_width(init_owner(*this) + init_name("line_width") + init_label(_("Line Width")) + init_description(_("Maximum width of a single line of text..")) + init_value(200.0)),
m_line_spacing(init_owner(*this) + init_name("line_spacing") + init_label(_("Line Spacing")) + init_description(_("Controls the spacing between lines of text.")) + init_value(1.0)),
diff -ur k3d-source-0.7.10.0.orig/modules/annotation/annotation_3d.cpp k3d-source-0.7.10.0/modules/annotation/annotation_3d.cpp
--- k3d-source-0.7.10.0.orig/modules/annotation/annotation_3d.cpp 2008-12-14 22:03:53.000000000 +0100
+++ k3d-source-0.7.10.0/modules/annotation/annotation_3d.cpp 2009-03-10 09:29:17.000000000 +0100
@@ -57,7 +57,7 @@
public:
annotation_3d(k3d::iplugin_factory& Factory, k3d::idocument& Document) :
base(Factory, Document),
- m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("fonts/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())),
+ m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())),
m_font_size(init_owner(*this) + init_name("font_size") + init_label(_("Font Size")) + init_description(_("Font size.")) + init_value(14.0)),
m_line_width(init_owner(*this) + init_name("line_width") + init_label(_("Line Width")) + init_description(_("Maximum width of a single line of text..")) + init_value(200.0)),
m_line_spacing(init_owner(*this) + init_name("line_spacing") + init_label(_("Line Spacing")) + init_description(_("Controls the spacing between lines of text.")) + init_value(1.0)),
diff -ur k3d-source-0.7.10.0.orig/modules/annotation/annotation.cpp k3d-source-0.7.10.0/modules/annotation/annotation.cpp
--- k3d-source-0.7.10.0.orig/modules/annotation/annotation.cpp 2008-12-14 22:03:53.000000000 +0100
+++ k3d-source-0.7.10.0/modules/annotation/annotation.cpp 2009-03-10 09:29:17.000000000 +0100
@@ -55,7 +55,7 @@
public:
annotation(k3d::iplugin_factory& Factory, k3d::idocument& Document) :
base(Factory, Document),
- m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("fonts/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())),
+ m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())),
m_font_size(init_owner(*this) + init_name("font_size") + init_label(_("Font Size")) + init_description(_("Font size.")) + init_value(14.0)),
m_line_width(init_owner(*this) + init_name("line_width") + init_label(_("Line Width")) + init_description(_("Maximum width of a single line of text..")) + init_value(200.0)),
m_line_spacing(init_owner(*this) + init_name("line_spacing") + init_label(_("Line Spacing")) + init_description(_("Controls the spacing between lines of text.")) + init_value(1.0)),
diff -ur k3d-source-0.7.10.0.orig/modules/core/axes.cpp k3d-source-0.7.10.0/modules/core/axes.cpp
--- k3d-source-0.7.10.0.orig/modules/core/axes.cpp 2008-12-14 22:03:50.000000000 +0100
+++ k3d-source-0.7.10.0/modules/core/axes.cpp 2009-03-10 09:29:17.000000000 +0100
@@ -67,7 +67,7 @@
m_y_color(init_owner(*this) + init_name("ycolor") + init_label(_("Y Color")) + init_description(_("Y axis color")) + init_value(k3d::color(0, 0.7, 0))),
m_z_color(init_owner(*this) + init_name("zcolor") + init_label(_("Z Color")) + init_description(_("Z axis color")) + init_value(k3d::color(0, 0, 0.7))),
m_grid_color(init_owner(*this) + init_name("gridcolor") + init_label(_("Grid Color")) + init_description(_("Grid color")) + init_value(k3d::color(0.4, 0.4, 0.4))),
- m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("fonts/Vera.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())),
+ m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/Vera.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())),
m_font_size(init_owner(*this) + init_name("font_size") + init_label(_("Font Size")) + init_description(_("Font size.")) + init_value(12.0))
{
m_axes.changed_signal().connect(make_async_redraw_slot());
diff -ur k3d-source-0.7.10.0.orig/modules/freetype2/poly_text.cpp k3d-source-0.7.10.0/modules/freetype2/poly_text.cpp
--- k3d-source-0.7.10.0.orig/modules/freetype2/poly_text.cpp 2008-12-14 22:03:50.000000000 +0100
+++ k3d-source-0.7.10.0/modules/freetype2/poly_text.cpp 2009-03-10 09:29:17.000000000 +0100
@@ -51,7 +51,7 @@
const k3d::filesystem::path default_font()
{
- return k3d::share_path() / k3d::filesystem::generic_path("fonts/VeraBd.ttf");
+ return k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/VeraBd.ttf");
}
/// Defines a closed contour
diff -ur k3d-source-0.7.10.0.orig/modules/opengl_painters/edge_numbering_painter.cpp k3d-source-0.7.10.0/modules/opengl_painters/edge_numbering_painter.cpp
--- k3d-source-0.7.10.0.orig/modules/opengl_painters/edge_numbering_painter.cpp 2008-12-14 22:03:51.000000000 +0100
+++ k3d-source-0.7.10.0/modules/opengl_painters/edge_numbering_painter.cpp 2009-03-10 09:29:17.000000000 +0100
@@ -57,7 +57,7 @@
public:
edge_numbering_painter(k3d::iplugin_factory& Factory, k3d::idocument& Document) :
base(Factory, Document),
- m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("fonts/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())),
+ m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())),
m_font_size(init_owner(*this) + init_name("font_size") + init_label(_("Font Size")) + init_description(_("Font size.")) + init_value(14.0)),
m_antialias(init_owner(*this) + init_name("antialias") + init_label(_("Font Antialiasing")) + init_description(_("Render antialiased text.")) + init_value(true)),
m_draw_selected(init_owner(*this) + init_name("draw_selected") + init_label(_("Draw Selected")) + init_description(_("Draw normals for selected polygons.")) + init_value(true)),
diff -ur k3d-source-0.7.10.0.orig/modules/opengl_painters/face_numbering_painter.cpp k3d-source-0.7.10.0/modules/opengl_painters/face_numbering_painter.cpp
--- k3d-source-0.7.10.0.orig/modules/opengl_painters/face_numbering_painter.cpp 2008-12-14 22:03:52.000000000 +0100
+++ k3d-source-0.7.10.0/modules/opengl_painters/face_numbering_painter.cpp 2009-03-10 09:29:17.000000000 +0100
@@ -57,7 +57,7 @@
public:
face_numbering_painter(k3d::iplugin_factory& Factory, k3d::idocument& Document) :
base(Factory, Document),
- m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("fonts/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())),
+ m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())),
m_font_size(init_owner(*this) + init_name("font_size") + init_label(_("Font Size")) + init_description(_("Font size.")) + init_value(14.0)),
m_antialias(init_owner(*this) + init_name("antialias") + init_label(_("Font Antialiasing")) + init_description(_("Render antialiased text.")) + init_value(true)),
m_draw_selected(init_owner(*this) + init_name("draw_selected") + init_label(_("Draw Selected")) + init_description(_("Draw normals for selected polygons")) + init_value(true)),
diff -ur k3d-source-0.7.10.0.orig/modules/opengl_painters/nurbs_curve_numbering_painter.cpp k3d-source-0.7.10.0/modules/opengl_painters/nurbs_curve_numbering_painter.cpp
--- k3d-source-0.7.10.0.orig/modules/opengl_painters/nurbs_curve_numbering_painter.cpp 2008-12-14 22:03:52.000000000 +0100
+++ k3d-source-0.7.10.0/modules/opengl_painters/nurbs_curve_numbering_painter.cpp 2009-03-10 09:29:17.000000000 +0100
@@ -57,7 +57,7 @@
public:
nurbs_curve_numbering_painter(k3d::iplugin_factory& Factory, k3d::idocument& Document) :
base(Factory, Document),
- m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("fonts/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())),
+ m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())),
m_font_size(init_owner(*this) + init_name("font_size") + init_label(_("Font Size")) + init_description(_("Font size.")) + init_value(14.0)),
m_antialias(init_owner(*this) + init_name("antialias") + init_label(_("Font Antialiasing")) + init_description(_("Render antialiased text.")) + init_value(true)),
m_draw_selected(init_owner(*this) + init_name("draw_selected") + init_label(_("Draw Selected")) + init_description(_("Draw normals for selected curves.")) + init_value(true)),
diff -ur k3d-source-0.7.10.0.orig/modules/opengl_painters/nurbs_patch_numbering_painter.cpp k3d-source-0.7.10.0/modules/opengl_painters/nurbs_patch_numbering_painter.cpp
--- k3d-source-0.7.10.0.orig/modules/opengl_painters/nurbs_patch_numbering_painter.cpp 2008-12-14 22:03:52.000000000 +0100
+++ k3d-source-0.7.10.0/modules/opengl_painters/nurbs_patch_numbering_painter.cpp 2009-03-10 09:29:17.000000000 +0100
@@ -57,7 +57,7 @@
public:
nurbs_patch_numbering_painter(k3d::iplugin_factory& Factory, k3d::idocument& Document) :
base(Factory, Document),
- m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("fonts/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())),
+ m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())),
m_font_size(init_owner(*this) + init_name("font_size") + init_label(_("Font Size")) + init_description(_("Font size.")) + init_value(14.0)),
m_antialias(init_owner(*this) + init_name("antialias") + init_label(_("Font Antialiasing")) + init_description(_("Render antialiased text.")) + init_value(true)),
m_draw_selected(init_owner(*this) + init_name("draw_selected") + init_label(_("Draw Selected")) + init_description(_("Draw normals for selected patches.")) + init_value(true)),
diff -ur k3d-source-0.7.10.0.orig/modules/opengl_painters/point_numbering_painter.cpp k3d-source-0.7.10.0/modules/opengl_painters/point_numbering_painter.cpp
--- k3d-source-0.7.10.0.orig/modules/opengl_painters/point_numbering_painter.cpp 2008-12-14 22:03:51.000000000 +0100
+++ k3d-source-0.7.10.0/modules/opengl_painters/point_numbering_painter.cpp 2009-03-10 09:29:17.000000000 +0100
@@ -57,7 +57,7 @@
public:
point_numbering_painter(k3d::iplugin_factory& Factory, k3d::idocument& Document) :
base(Factory, Document),
- m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("fonts/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())),
+ m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())),
m_font_size(init_owner(*this) + init_name("font_size") + init_label(_("Font Size")) + init_description(_("Font size.")) + init_value(14.0)),
m_antialias(init_owner(*this) + init_name("antialias") + init_label(_("Font Antialiasing")) + init_description(_("Render antialiased text.")) + init_value(true)),
m_draw_selected(init_owner(*this) + init_name("draw_selected") + init_label(_("Draw Selected")) + init_description(_("Draw normals for selected polygons")) + init_value(true)),
diff -ur k3d-source-0.7.10.0.orig/modules/opengl_painters/varying_data_painter.cpp k3d-source-0.7.10.0/modules/opengl_painters/varying_data_painter.cpp
--- k3d-source-0.7.10.0.orig/modules/opengl_painters/varying_data_painter.cpp 2008-12-14 22:03:51.000000000 +0100
+++ k3d-source-0.7.10.0/modules/opengl_painters/varying_data_painter.cpp 2009-03-10 09:29:17.000000000 +0100
@@ -82,7 +82,7 @@
public:
varying_data_painter(k3d::iplugin_factory& Factory, k3d::idocument& Document) :
base(Factory, Document),
- m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("fonts/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())),
+ m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())),
m_font_size(init_owner(*this) + init_name("font_size") + init_label(_("Font Size")) + init_description(_("Font size.")) + init_value(14.0)),
m_antialias(init_owner(*this) + init_name("antialias") + init_label(_("Font Antialiasing")) + init_description(_("Render antialiased text.")) + init_value(true)),
m_color(init_owner(*this) + init_name("color") + init_label(_("Color")) + init_description(_("Color of the text")) + init_value(k3d::color(0, 1, 0))),
diff -ur k3d-source-0.7.10.0.orig/modules/opengl_painters/vertex_data_painter.cpp k3d-source-0.7.10.0/modules/opengl_painters/vertex_data_painter.cpp
--- k3d-source-0.7.10.0.orig/modules/opengl_painters/vertex_data_painter.cpp 2008-12-14 22:03:52.000000000 +0100
+++ k3d-source-0.7.10.0/modules/opengl_painters/vertex_data_painter.cpp 2009-03-10 09:29:17.000000000 +0100
@@ -80,7 +80,7 @@
public:
vertex_data_painter(k3d::iplugin_factory& Factory, k3d::idocument& Document) :
base(Factory, Document),
- m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("fonts/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())),
+ m_font_path(init_owner(*this) + init_name("font") + init_label(_("Font")) + init_description(_("Font path")) + init_value(k3d::share_path() / k3d::filesystem::generic_path("../fonts/bitstream-vera/VeraBd.ttf")) + init_path_mode(k3d::ipath_property::READ) + init_path_type(k3d::options::path::fonts())),
m_font_size(init_owner(*this) + init_name("font_size") + init_label(_("Font Size")) + init_description(_("Font size.")) + init_value(14.0)),
m_antialias(init_owner(*this) + init_name("antialias") + init_label(_("Font Antialiasing")) + init_description(_("Render antialiased text.")) + init_value(true)),
m_color(init_owner(*this) + init_name("color") + init_label(_("Color")) + init_description(_("Color of the numbers")) + init_value(k3d::color(0.5, 0, 0))),
k3d-0.7.10.0-potfiles.patch:
--- NEW FILE k3d-0.7.10.0-potfiles.patch ---
--- k3d-source-0.7.10.0/po/POTFILES.in~ 2008-12-14 22:03:53.000000000 +0100
+++ k3d-source-0.7.10.0/po/POTFILES.in 2009-01-21 10:47:19.000000000 +0100
@@ -1,6 +1,5 @@
application/k3d_main.cpp
application/main.cpp
-bug-buddy/main.cpp
k3dsdk/bitmap_modifier.h
k3dsdk/bitmap_sink.h
k3dsdk/bitmap_source.h
@@ -185,10 +184,10 @@
modules/jpeg_io/bitmap_importer.cpp
modules/jpeg_io/bitmap_reader.cpp
modules/jpeg_io/bitmap_writer.cpp
-modules/k3d_io/k3d_document_exporter.cpp
-modules/k3d_io/k3d_document_importer.cpp
-modules/k3d_io/k3d_mesh_reader.cpp
-modules/k3d_io/k3d_mesh_writer.cpp
+modules/k3d_io/document_exporter.cpp
+modules/k3d_io/document_importer.cpp
+modules/k3d_io/mesh_reader.cpp
+modules/k3d_io/mesh_writer.cpp
modules/k3dscript/engine.cpp
modules/linear_curve/knot_curve.cpp
modules/linear_curve/lissajous_curve.cpp
k3d-0.7.10.0-warn.patch:
--- NEW FILE k3d-0.7.10.0-warn.patch ---
--- k3d-source-0.7.10.0/share/shaders/k3d_functions.h~ 2008-12-14 22:03:49.000000000 +0100
+++ k3d-source-0.7.10.0/share/shaders/k3d_functions.h 2009-03-10 09:00:30.000000000 +0100
@@ -24,10 +24,3 @@
/* separate fuzzes */
#define smoothPulse2Fuzz(a, b, afuzz, bfuzz, loc) (smoothstep (a-afuzz, a, loc) - smoothstep (b, b+bfuzz, loc))
-
-
-
-
-
-
-
\ No newline at end of file
--- NEW FILE k3d.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=K-3D
Name[sv_SE.ISO8859-15]=K-3D
Comment=3D modeling and animation
Comment[sv_SE.ISO8859-15]=3D modellering och animation
Exec=/usr/bin/k3d
Icon=/usr/share/k3d/icons/k3d.png
Terminal=false
Type=Application
Categories=Application;Graphics;
X-Desktop-File-Install-Version=0.15
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/k3d/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 9 Jul 2007 07:23:29 -0000 1.10
+++ .cvsignore 10 Mar 2009 09:27:58 -0000 1.11
@@ -1 +1 @@
-k3d-0.6.7.0-src.tar.bz2
+k3d-source-0.7.10.0.tar.gz
Index: k3d.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3d/devel/k3d.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- k3d.spec 25 Feb 2009 10:03:28 -0000 1.26
+++ k3d.spec 10 Mar 2009 09:27:59 -0000 1.27
@@ -1,22 +1,22 @@
Name: k3d
-Version: 0.6.7.0
-Release: 10%{?dist}
+Version: 0.7.10.0
+Release: 1%{?dist}
Summary: A 3D Modeling, Animation and Rendering System
Group: Applications/Multimedia
License: GPLv2+
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.6.0-vfs.patch
-Patch2: k3d-0.6.7.0-desktop.patch
-Patch3: k3d-0.6.7.0-gcc43.patch
-Patch4: k3d-0.6.7.0-sigc2.patch
+Source0: http://dl.sourceforge.net/k3d/k3d-source-%{version}.tar.gz
+Source1: k3d.desktop
+Patch0: k3d-0.7.10.0-potfiles.patch
+Patch1: k3d-0.7.10.0-warn.patch
+Patch2: k3d-0.7.10.0-fontpath.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: aqsis
+BuildRequires: cmake
BuildRequires: desktop-file-utils
BuildRequires: mesa-libGL-devel
BuildRequires: expat-devel
@@ -37,12 +37,18 @@
BuildRequires: librsvg2
BuildRequires: bzip2-devel
BuildRequires: libtool
+BuildRequires: libpng-devel
+BuildRequires: cairomm-devel
+
+Requires: bitstream-vera-fonts
Requires(post): /sbin/ldconfig
Requires(post): desktop-file-utils
Requires(postun): /sbin/ldconfig
Requires(postun): desktop-file-utils
+Obsoletes: k3d-examples < 0.7.10.0
+
%description
K-3D is a complete 3D modeling, animation and rendering system. K-3D
@@ -63,49 +69,52 @@
rendering a model written by K-3D.
-%package examples
-Summary: Examples for K-3D
-Group: Development/Demos
-
-
-%description examples
-This package contains examples of K-3D documents.
-
-
%prep
-%setup -q
-%patch0 -p1 -b .gl64
-%patch1 -p1 -b .vfs
-%patch2 -p1 -b .desktop
-%patch3 -p1 -b .gcc43
-%patch4 -p1 -b .sigc2
+%setup -q -n k3d-source-%{version}
+%patch0 -p 1 -b .potfiles
+%patch1 -p 1 -b .warn
+%patch2 -p 1 -b .fontpath
%build
-%configure --disable-static --with-external-boost
-make %{?_smp_mflags}
+mkdir b
+cd b
+%cmake ..
+# Since our cmake macro disables rpath, we need to set some temp
+# library paths as the build invokes some built binaries to generate
+# proxy files.
+export LD_LIBRARY_PATH=%{_builddir}/k3d-source-%{version}/b/lib:$LD_LIBRARY_PATH
+echo LD_LIBRARY_PATH is $LD_LIBRARY_PATH
+make VERBOSE=1 %{?_smp_mflags}
%install
-
find -type f -regex '.*\.\(cpp\|h\|svg\)' -perm +111 -exec chmod -x {} ';'
+rm -rf $RPM_BUILD_ROOT
+cd b
make install DESTDIR=$RPM_BUILD_ROOT
+# Workaround for install bug
+cp lib/libk3dsdk-python-primitives.so $RPM_BUILD_ROOT%{_libdir}
+rm -fr $RPM_BUILD_ROOT%{_datadir}/k3d/locale/chef/LC_MESSAGES/k3d.mo
+# Remove fonts, we use Fedora-shipped fonts instead
+rm -fr $RPM_BUILD_ROOT${_datadir}/k3d/fonts
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-desktop-file-install \
- --vendor fedora \
- --mode 644 \
- --delete-original \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- $RPM_BUILD_ROOT%{_datadir}/applications/k3d.desktop
+desktop-file-install --vendor "fedora" \
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ %{SOURCE1}
%clean
rm -rf $RPM_BUILD_ROOT
+%check
+ctest
+
+
%post
/sbin/ldconfig
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
@@ -118,49 +127,29 @@
%files
%defattr(-, root, root, -)
-%doc AUTHORS COPYING NEWS README
-%{_bindir}/k3d
-%{_bindir}/k3d-[bd-z]*
-%{_libdir}/libHapy.so.*
-%{_libdir}/libk3dngui.so*
-%{_libdir}/libk3dnui.so*
-%{_libdir}/libk3dsdk.so.*
-%{_libdir}/libsubdivision_surface.so.*
-%{_libdir}/libsurface_polygonizer.so.*
+%doc AUTHORS COPYING README
+%{_bindir}/k3d*
+%{_libdir}/*.so*
%{_libdir}/k3d
-%{_datadir}/applications/fedora-k3d.desktop
-%dir %{_datadir}/k3d
-%{_datadir}/k3d/*.k3d
-%{_datadir}/k3d/fonts
-%{_datadir}/k3d/icons
-%{_datadir}/k3d/logo
-%{_datadir}/k3d/lsystem
-%{_datadir}/k3d/ngui
-%{_datadir}/k3d/qtui
-%{_datadir}/k3d/scripts
-%{_datadir}/k3d/shaders
-%{_datadir}/k3d/textures
-%{_datadir}/k3d/tutorials
+%{_datadir}/k3d
%{_mandir}/man1/k3d*
-%files examples
-%defattr(-, root, root, -)
-%{_datadir}/k3d/documents
-
-
%files devel
%defattr(-, root, root, -)
-%doc ChangeLog
-%{_bindir}/k3d-config
%{_includedir}/k3d
-%{_libdir}/libHapy.so
-%{_libdir}/libk3dsdk.so
-%{_libdir}/libsubdivision_surface.so
-%{_libdir}/libsurface_polygonizer.so
+%{_libdir}/*.so
%changelog
+* Wed Mar 4 2009 Denis Leroy <denis at poolshark.org> - 0.7.10.0-1
+- Update to upstream 0.7.10.0
+- Build system now based on cmake
+- All patches upstreamed or obsoleted
+- Added potfiles file list patch fix
+- Removed example subpackage
+- Removed packaged bitstream fonts, use Fedora ones instead
+
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.7.0-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/k3d/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 9 Jul 2007 07:23:29 -0000 1.10
+++ sources 10 Mar 2009 09:27:59 -0000 1.11
@@ -1 +1 @@
-0031402206dab46b563d149eac2324db k3d-0.6.7.0-src.tar.bz2
+52736c4e2d3df11af741ed356f8bc448 k3d-source-0.7.10.0.tar.gz
--- k3d-0.5.15.0-gl64.patch DELETED ---
--- k3d-0.6.6.0-vfs.patch DELETED ---
--- k3d-0.6.7.0-desktop.patch DELETED ---
--- k3d-0.6.7.0-gcc43.patch DELETED ---
--- k3d-0.6.7.0-sigc2.patch DELETED ---
More information about the fedora-extras-commits
mailing list