rpms/lmms/F-11 import.log, 1.6, 1.7 lmms-0.4.6-libexecdir.patch, 1.1, 1.2 lmms.spec, 1.7, 1.8 lmms-0.4.6-libdir.patch, 1.1, NONE

[Thomas Moschny]

Author: thm

Update of /cvs/pkgs/rpms/lmms/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20183/F-11

Modified Files:
	import.log lmms-0.4.6-libexecdir.patch lmms.spec 
Removed Files:
	lmms-0.4.6-libdir.patch 
Log Message:
Fix for bz 555852.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/lmms/F-11/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	30 Dec 2009 21:45:20 -0000	1.6
+++ import.log	15 Jan 2010 21:20:41 -0000	1.7
@@ -4,3 +4,4 @@ lmms-0_4_3-1_fc10:HEAD:lmms-0.4.3-1.fc10
 lmms-0_4_4-1_fc11:F-11:lmms-0.4.4-1.fc11.src.rpm:1242758782
 lmms-0_4_5-1_fc11:F-11:lmms-0.4.5-1.fc11.src.rpm:1252099682
 lmms-0_4_6-1_fc12:F-11:lmms-0.4.6-1.fc12.src.rpm:1262209321
+lmms-0_4_6-2_fc12:F-11:lmms-0.4.6-2.fc12.src.rpm:1263590279

lmms-0.4.6-libexecdir.patch:
 CMakeLists.txt                     |    2 +-
 plugins/vst_base/CMakeLists.txt    |    2 +-
 plugins/zynaddsubfx/CMakeLists.txt |    2 +-
 src/core/RemotePlugin.cpp          |    4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

Index: lmms-0.4.6-libexecdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/lmms/F-11/lmms-0.4.6-libexecdir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lmms-0.4.6-libexecdir.patch	30 Dec 2009 21:45:20 -0000	1.1
+++ lmms-0.4.6-libexecdir.patch	15 Jan 2010 21:20:42 -0000	1.2
@@ -5,8 +5,8 @@ diff -up lmms-0.4.6/CMakeLists.txt.orig 
  #
  # build LMMS-binary
  #
--ADD_DEFINITIONS(-D'LIB_DIR="${LIB_DIR}/"' -D'PLUGIN_DIR="${LIB_DIR}/lmms/"' ${PULSEAUDIO_DEFINITIONS} ${PORTAUDIO_DEFINITIONS})
-+ADD_DEFINITIONS(-D'LIB_DIR="${LIB_DIR}/"' -D'PLUGIN_DIR="${LIB_DIR}/lmms/"' -D'LIBEXEC_DIR="${LIBEXEC_INSTALL_DIR}"' ${PULSEAUDIO_DEFINITIONS} ${PORTAUDIO_DEFINITIONS})
+-ADD_DEFINITIONS(-D'LIB_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/"' -D'PLUGIN_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/lmms/"' ${PULSEAUDIO_DEFINITIONS} ${PORTAUDIO_DEFINITIONS})
++ADD_DEFINITIONS(-D'LIB_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/"' -D'PLUGIN_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/lmms/"' -D'LIBEXEC_DIR="${LIBEXEC_INSTALL_DIR}"' ${PULSEAUDIO_DEFINITIONS} ${PORTAUDIO_DEFINITIONS})
  
  INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/include ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/include ${SDL_INCLUDE_DIR} ${PORTAUDIO_INCLUDE_DIR} ${PULSEAUDIO_INCLUDE_DIR} ${JACK_INCLUDE_DIRS} ${OGGVORBIS_INCLUDE_DIR} ${SAMPLERATE_INCLUDE_DIRS} ${SNDFILE_INCLUDE_DIRS})
  LINK_DIRECTORIES(${CMAKE_INSTALL_PREFIX}/lib ${ASOUND_LIBRARY_DIR} ${JACK_LIBRARY_DIRS} ${SAMPLERATE_LIBRARY_DIRS} ${SNDFILE_LIBRARY_DIRS})


Index: lmms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lmms/F-11/lmms.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- lmms.spec	30 Dec 2009 21:45:20 -0000	1.7
+++ lmms.spec	15 Jan 2010 21:20:42 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           lmms
 Version:        0.4.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Linux MultiMedia Studio
 URL:            http://lmms.sourceforge.net/
 Group:          Applications/Multimedia
@@ -35,15 +35,12 @@ Source0:        %{name}-%{version}.strip
 # until their license situation becomes clearer.
 Source1:        README.fedora
 
-# our cmake seems to have a different value for LIB_DIR.
-Patch0:         lmms-0.4.6-libdir.patch
-
 # move the vst and zynaddsubfx plugins to libexecdir.
-Patch1:         lmms-0.4.6-libexecdir.patch
+Patch0:         lmms-0.4.6-libexecdir.patch
 
 # build with vst support but without having wine. that is a patch
 # upstream isn't really interested in.
-Patch2:         lmms-0.4.6-vst-nowine.patch
+Patch1:         lmms-0.4.6-vst-nowine.patch
 
 # FIXME: we surely want to patch zynaddsubfx to use system's fltk and
 # minixml. using system's zynaddsubfx however is, according to lmms'
@@ -124,11 +121,14 @@ The %{name}-devel package contains heade
 developing addons for %{name}.
 
 
+# rpath needed e.g. for /usr/libexec/RemoteZynAddSubFx
+%global _cmake_skip_rpath %{nil}
+
+
 %prep
 %setup0 -q
-%patch0 -p1 -b .libdir
-%patch1 -p1 -b .libexecdir
-%patch2 -p1 -b .nowine
+%patch0 -p1 -b .libexecdir
+%patch1 -p1 -b .nowine
 
 # remove spurious x-bits
 find . -type f -exec chmod 0644 {} \;
@@ -152,6 +152,7 @@ find . -type f -exec chmod 0644 {} \;
 %ifarch x86_64
        -DWANT_VST_NOWINE:BOOL=ON \
 %endif
+       -DCMAKE_INSTALL_LIBDIR=%{_lib} \
        -DLIBEXEC_INSTALL_DIR=%{_libexecdir} \
        .
 make VERBOSE=1 %{?_smp_mflags}
@@ -223,6 +224,12 @@ This package contains the necessary file
 
 
 %changelog
+* 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
+  properly, drop the libdir patch, and set CMAKE_INSTALL_LIBDIR
+  instead. Thanks to Rex Dieter for helping with that issue.
+
 * Wed Dec 30 2009 Thomas Moschny <thomas.moschny at gmx.de> - 0.4.6-1
 - Update to 0.4.6.
 - Rebase patches.


--- lmms-0.4.6-libdir.patch DELETED ---