From 345bdb4c655ef8417c16ab3d03140961ad4436b3 Mon Sep 17 00:00:00 2001
From: corsepiu <corsepiu@fedoraproject.org>
Date: Feb 10 2010 13:33:41 +0000
Subject: - Add BR: pkgconfig(uuid).

- Remove BR: libuuid-devel, libgnome-devel, graphviz-devel.
- Remove broken fontdir removal.

---

diff --git a/k3d.spec b/k3d.spec
index cc24775..09d2a90 100644
--- a/k3d.spec
+++ b/k3d.spec
@@ -1,6 +1,6 @@
 Name:           k3d
 Version:        0.7.11.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A 3D Modeling, Animation and Rendering System
 
 Group:          Applications/Multimedia
@@ -23,19 +23,15 @@ BuildRequires:  desktop-file-utils
 BuildRequires:  expat-devel
 BuildRequires:  freetype-devel
 BuildRequires:  gnome-vfs2-devel
-BuildRequires:  graphviz-devel
 BuildRequires:  gtkglext-devel
 BuildRequires:  gtkmm24-devel
 BuildRequires:  gts-devel
 BuildRequires:  ImageMagick-c++-devel
-BuildRequires:  libgnome-devel
-#BuildRequires:  libpng-devel
-#BuildRequires:  libsigc++20-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  libtool doxygen gettext
-BuildRequires:  libuuid-devel
 BuildRequires:  mesa-libGL-devel
 BuildRequires:  OpenEXR-devel
+BuildRequires:  pkgconfig(uuid)
 BuildRequires:  plib-devel
 BuildRequires:  python-devel
 
@@ -80,6 +76,8 @@ rendering a model written by K-3D.
 rm -f CMakeCache.txt
 find . \( -type f -a -executable \) -exec chmod -x "{}" \;
 
+sed -i -e "s,\${k3d_BINARY_DIR}/lib,\${k3d_BINARY_DIR}/%{_lib}," k3dsdk/ftgl/CMakeLists.txt
+
 %build
 mkdir BUILD
 cd BUILD
@@ -87,7 +85,7 @@ cd BUILD
 # 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}/BUILD/lib:%{_builddir}/k3d-source-%{version}/BUILD/lib64:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=%{_builddir}/k3d-source-%{version}/BUILD/%{_lib}
 make VERBOSE=1 %{?_smp_mflags}
 cd ..
 
@@ -99,7 +97,7 @@ cd ..
 # Workaround for install bug
 rm -f $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
+rm -fr $RPM_BUILD_ROOT%{_datadir}/k3d/fonts
 
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
@@ -138,7 +136,6 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %dir %{_datadir}/k3d
 %{_datadir}/k3d/*.k3d
 %{_datadir}/k3d/documents
-%{_datadir}/k3d/fonts
 %{_datadir}/k3d/icons
 %{_datadir}/k3d/locale
 %{_datadir}/k3d/logo
@@ -167,6 +164,11 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %changelog
+* Tue Feb 09 2010 Ralf Corsépius <corsepiu@fedoraproject.org> - 0.7.11.0-6
+- Add BR: pkgconfig(uuid).
+- Remove BR: libuuid-devel, libgnome-devel, graphviz-devel.
+- Remove broken fontdir removal.
+
 * Tue Feb 09 2010 Ralf Corsépius <corsepiu@fedoraproject.org> - 0.7.11.0-5
 - Switch back to using to using libuuid (Remove k3d-0.7.11.0-ossp-uuid.patch).
 - Remove BR: e2fsprogs-devel, librsvg2, libsigc++20-devel, libpng-devel.