rpms/lmms/devel lmms-0.4.6-dso.patch, NONE, 1.1 import.log, 1.7, 1.8 lmms.spec, 1.10, 1.11

[Thomas Moschny]

Author: thm

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

Modified Files:
	import.log lmms.spec 
Added Files:
	lmms-0.4.6-dso.patch 
Log Message:
Add patch to fix DSO issue.

lmms-0.4.6-dso.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE lmms-0.4.6-dso.patch ---
diff -up lmms-0.4.6/plugins/zynaddsubfx/CMakeLists.txt.orig lmms-0.4.6/plugins/zynaddsubfx/CMakeLists.txt
--- lmms-0.4.6/plugins/zynaddsubfx/CMakeLists.txt.orig	2010-02-10 02:27:09.576755869 +0100
+++ lmms-0.4.6/plugins/zynaddsubfx/CMakeLists.txt	2010-02-10 02:28:01.158005520 +0100
@@ -106,7 +106,7 @@ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 ADD_EXECUTABLE(RemoteZynAddSubFx RemoteZynAddSubFx.cpp ${ZYN_SRC_GUI})
 INSTALL(TARGETS RemoteZynAddSubFx RUNTIME DESTINATION ${LIBEXEC_INSTALL_DIR})
-TARGET_LINK_LIBRARIES(RemoteZynAddSubFx -L${CMAKE_CURRENT_BINARY_DIR} -lZynAddSubFxCore ${CMAKE_CURRENT_BINARY_DIR}/fltk/bin/libfltk.a)
+TARGET_LINK_LIBRARIES(RemoteZynAddSubFx -L${CMAKE_CURRENT_BINARY_DIR} -lZynAddSubFxCore ${CMAKE_CURRENT_BINARY_DIR}/fltk/bin/libfltk.a -lpthread -lfontconfig)
 ADD_DEPENDENCIES(RemoteZynAddSubFx ZynAddSubFxCore)
 
 # link system libraries when on win32


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/lmms/devel/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- import.log	15 Jan 2010 21:12:00 -0000	1.7
+++ import.log	10 Feb 2010 16:22:35 -0000	1.8
@@ -5,3 +5,4 @@ lmms-0_4_4-1_fc11:HEAD:lmms-0.4.4-1.fc11
 lmms-0_4_5-1_fc11:HEAD:lmms-0.4.5-1.fc11.src.rpm:1252099213
 lmms-0_4_6-1_fc12:HEAD:lmms-0.4.6-1.fc12.src.rpm:1262206312
 lmms-0_4_6-2_fc12:HEAD:lmms-0.4.6-2.fc12.src.rpm:1263589503
+lmms-0_4_6-3_fc13:HEAD:lmms-0.4.6-3.fc13.src.rpm:1265818912


Index: lmms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lmms/devel/lmms.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- lmms.spec	15 Jan 2010 21:12:00 -0000	1.10
+++ lmms.spec	10 Feb 2010 16:22:35 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           lmms
 Version:        0.4.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Linux MultiMedia Studio
 URL:            http://lmms.sourceforge.net/
 Group:          Applications/Multimedia
@@ -42,6 +42,9 @@ Patch0:         lmms-0.4.6-libexecdir.pa
 # upstream isn't really interested in.
 Patch1:         lmms-0.4.6-vst-nowine.patch
 
+# needs to be reported upstream
+Patch2:         lmms-0.4.6-dso.patch
+
 # FIXME: we surely want to patch zynaddsubfx to use system's fltk and
 # minixml. using system's zynaddsubfx however is, according to lmms'
 # developers, not possibe because there are to many changes.
@@ -129,6 +132,7 @@ developing addons for %{name}.
 %setup0 -q
 %patch0 -p1 -b .libexecdir
 %patch1 -p1 -b .nowine
+%patch2 -p1 -b .dso
 
 # remove spurious x-bits
 find . -type f -exec chmod 0644 {} \;
@@ -224,6 +228,9 @@ This package contains the necessary file
 
 
 %changelog
+* Wed Feb 10 2010 Thomas Moschny <thomas.moschny at gmx.de> - 0.4.6-3
+- Add patch to fix DSO issue.
+
 * Fri Jan 15 2010 Thomas Moschny <thomas.moschny at gmx.de> - 0.4.6-2
 - Let cmake create rpaths where needed. This should fix bz 555852
   (zynaddsubfx gui not showing up). In order to make that work