rpms/k3d/devel k3d-0.7.11.0-ossp-uuid.patch, NONE, 1.1 k3d.spec, 1.37, 1.38

corsepiu corsepiu at fedoraproject.org
Tue Feb 9 07:03:33 UTC 2010


Author: corsepiu

Update of /cvs/pkgs/rpms/k3d/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23124

Modified Files:
	k3d.spec 
Added Files:
	k3d-0.7.11.0-ossp-uuid.patch 
Log Message:
* Tue Feb 09 2010 Ralf Corsépius <corsepiu at fedoraproject.org> - 0.7.11.0-4
- Rebase uuid-generation against ossp-uuid (Address FTBS BZ #539048).
- Misc. spec-file clean up.
- Move %{_libdir}/*.so into base-package (BZ #513773).
- Move %{_libdir}/k3d/include into devel-package.
- Move %{_datadir}/k3d/shaders/*.h into devel-package.


k3d-0.7.11.0-ossp-uuid.patch:
 cmake/modules/K3DFindUUID.cmake |    2 +-
 k3dsdk/uuid.cpp                 |    9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

--- NEW FILE k3d-0.7.11.0-ossp-uuid.patch ---
diff -Naur k3d-source-0.7.11.0/cmake/modules/K3DFindUUID.cmake k3d-source-0.7.11.0.1/cmake/modules/K3DFindUUID.cmake
--- k3d-source-0.7.11.0/cmake/modules/K3DFindUUID.cmake	2009-03-19 21:29:03.000000000 +0100
+++ k3d-source-0.7.11.0.1/cmake/modules/K3DFindUUID.cmake	2010-02-09 03:26:18.000000000 +0100
@@ -2,7 +2,7 @@
 
 IF(UNIX)
 	INCLUDE(K3DFindPkgConfig)
-	PKG_CHECK_MODULES(UUID uuid)
+	PKG_CHECK_MODULES(UUID ossp-uuid)
 
 	IF(UUID_FOUND)
 		SET(K3D_UUID_INCLUDE_DIRS
diff -Naur k3d-source-0.7.11.0/k3dsdk/uuid.cpp k3d-source-0.7.11.0.1/k3dsdk/uuid.cpp
--- k3d-source-0.7.11.0/k3dsdk/uuid.cpp	2009-03-19 21:28:51.000000000 +0100
+++ k3d-source-0.7.11.0.1/k3dsdk/uuid.cpp	2010-02-08 18:25:14.000000000 +0100
@@ -29,7 +29,7 @@
 #ifdef K3D_API_WIN32
 	#include "win32.h"
 #else // K3D_API_WIN32
-	#include <uuid/uuid.h>
+	#include <uuid.h>
 #endif // !K3D_API_WIN32
 
 #include <iomanip>
@@ -68,9 +68,12 @@
 #ifdef K3D_API_WIN32
 	CoCreateGuid(reinterpret_cast<UUID*>(&result));
 #else // K3D_API_WIN32
-	uuid_t temp;
-	uuid_generate(temp);
+	uuid_t *temp;
+	// uuid_generate(temp);
+	uuid_create(&temp);
+	uuid_make(temp,UUID_MAKE_V4);
 	memcpy(&result, temp, sizeof(result));
+	uuid_destroy(temp);
 #endif // !K3D_API_WIN32
 
 	return result;


Index: k3d.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3d/devel/k3d.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- k3d.spec	21 Jan 2010 20:46:23 -0000	1.37
+++ k3d.spec	9 Feb 2010 07:03:32 -0000	1.38
@@ -1,18 +1,19 @@
 
 Name:           k3d
 Version:        0.7.11.0
-Release:        3%{?dist}
+Release:        4%{?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-source-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/k3d/k3d-source-%{version}.tar.gz
 Source1:        k3d.desktop
 Patch0:         k3d-0.7.11.0-potfiles.patch
 Patch1:         k3d-0.7.10.0-warn.patch
 Patch2:         k3d-0.7.11.0-fontpath.patch
 Patch3:         k3d-0.7.11.0-gcc44.patch
+Patch4:         k3d-0.7.11.0-ossp-uuid.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       aqsis
@@ -41,7 +42,7 @@ BuildRequires:  e2fsprogs-devel
 BuildRequires:  libtool doxygen gettext
 BuildRequires:  libpng-devel
 BuildRequires:  cairomm-devel
-BuildRequires:  uuid-c++-devel
+BuildRequires:  uuid-devel
 
 # Text widget uses bitstream font by default
 Requires:       bitstream-vera-sans-fonts
@@ -75,31 +76,30 @@ rendering a model written by K-3D.
 
 %prep
 %setup -q -n k3d-source-%{version}
-%patch0 -p 1 -b .potfiles
-%patch1 -p 1 -b .warn
-%patch2 -p 1 -b .fontpath
-%patch3 -p 1 -b .gcc44
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1 
 rm -f CMakeCache.txt
-
+find . \( -type f -a -executable \) -exec chmod -x "{}" \;
 
 %build
-mkdir b
-cd b
+mkdir BUILD
+cd BUILD
 %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:%{_builddir}/k3d-source-%{version}/b/lib64:$LD_LIBRARY_PATH
-echo LD_LIBRARY_PATH is $LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=%{_builddir}/k3d-source-%{version}/BUILD/lib:%{_builddir}/k3d-source-%{version}/BUILD/lib64:$LD_LIBRARY_PATH
 make VERBOSE=1 %{?_smp_mflags}
-
+cd ..
 
 %install
-find -type f -regex '.*\.\(cpp\|h\|svg\)' -perm +111 -exec chmod -x {} ';'
-
 rm -rf $RPM_BUILD_ROOT
-cd b
+cd BUILD
 make install DESTDIR=$RPM_BUILD_ROOT
+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
@@ -117,6 +117,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %check
+# FIXME: This doesn't work.
 ctest
 
 
@@ -134,9 +135,30 @@ update-desktop-database %{_datadir}/appl
 %defattr(-, root, root, -)
 %doc AUTHORS COPYING README
 %{_bindir}/k3d*
-%{_libdir}/*.so*
-%{_libdir}/k3d
-%{_datadir}/k3d
+%dir %{_libdir}/k3d
+%{_libdir}/k3d/plugins
+%{_libdir}/k3d/uiplugins
+%{_libdir}/*.so
+%dir %{_datadir}/k3d
+%{_datadir}/k3d/*.k3d
+%{_datadir}/k3d/documents
+%{_datadir}/k3d/fonts
+%{_datadir}/k3d/icons
+%{_datadir}/k3d/locale
+%{_datadir}/k3d/logo
+%{_datadir}/k3d/lsystem
+%{_datadir}/k3d/ngui
+%{_datadir}/k3d/qtui
+%{_datadir}/k3d/scripts
+%dir %{_datadir}/k3d/shaders
+%{_datadir}/k3d/shaders/displacemnt
+%{_datadir}/k3d/shaders/glsl
+%{_datadir}/k3d/shaders/imager
+%{_datadir}/k3d/shaders/light
+%{_datadir}/k3d/shaders/surface
+%{_datadir}/k3d/shaders/volume
+%{_datadir}/k3d/textures
+%{_datadir}/k3d/tutorials
 %{_mandir}/man1/k3d*
 %{_datadir}/applications/*.desktop
 
@@ -144,10 +166,18 @@ update-desktop-database %{_datadir}/appl
 %files devel
 %defattr(-, root, root, -)
 %{_includedir}/k3d
-%{_libdir}/*.so
+%{_libdir}/k3d/include
+%{_datadir}/k3d/shaders/*.h
 
 
 %changelog
+* Tue Feb 09 2010 Ralf Corsépius <corsepiu at fedoraproject.org> - 0.7.11.0-4
+- Rebase uuid-generation against ossp-uuid (Address FTBS BZ #539048).
+- Misc. spec-file clean up.
+- Move %%{_libdir}/*.so into base-package (BZ #513773).
+- Move %%{_libdir}/k3d/include into devel-package.
+- Move %%{_datadir}/k3d/shaders/*.h into devel-package.
+
 * Fri Jan 22 2010 Rahul Sundaram <sundaram at fedoraproject.org> - 0.7.11.0-3
 - Rebuild for Boost soname bump
 



More information about the scm-commits mailing list