diff --git a/fluidsynth-fix-cmake-usage.patch b/fluidsynth-fix-cmake-usage.patch new file mode 100644 index 0000000..11127c7 --- /dev/null +++ b/fluidsynth-fix-cmake-usage.patch @@ -0,0 +1,33 @@ +diff -rupN fluidsynth-1.1.5.old/CMakeLists.txt fluidsynth-1.1.5/CMakeLists.txt +--- fluidsynth-1.1.5.old/CMakeLists.txt 2011-09-04 03:38:58.000000000 -0400 ++++ fluidsynth-1.1.5/CMakeLists.txt 2011-09-16 00:26:23.000000000 -0400 +@@ -407,12 +407,12 @@ if ( UNIX ) + # pkg-config support + set ( prefix "${CMAKE_INSTALL_PREFIX}" ) + set ( exec_prefix "\${prefix}" ) +- set ( libdir "\${exec_prefix}/${LIB_INSTALL_DIR}${LIB_SUFFIX}" ) +- set ( includedir "\${prefix}/${INCLUDE_INSTALL_DIR}" ) ++ set ( libdir "${LIB_INSTALL_DIR}" ) ++ set ( includedir "${INCLUDE_INSTALL_DIR}" ) + configure_file ( fluidsynth.pc.in + ${CMAKE_BINARY_DIR}/fluidsynth.pc IMMEDIATE @ONLY ) + install ( FILES ${CMAKE_BINARY_DIR}/fluidsynth.pc +- DESTINATION ${LIB_INSTALL_DIR}${LIB_SUFFIX}/pkgconfig ) ++ DESTINATION ${LIB_INSTALL_DIR}/pkgconfig ) + + # uninstall custom target + configure_file ( "${CMAKE_SOURCE_DIR}/cmake_admin/cmake_uninstall.cmake.in" +diff -rupN fluidsynth-1.1.5.old/src/CMakeLists.txt fluidsynth-1.1.5/src/CMakeLists.txt +--- fluidsynth-1.1.5.old/src/CMakeLists.txt 2011-09-04 03:38:58.000000000 -0400 ++++ fluidsynth-1.1.5/src/CMakeLists.txt 2011-09-16 00:26:39.000000000 -0400 +@@ -324,8 +324,8 @@ if ( MACOSX_FRAMEWORK ) + else ( MACOSX_FRAMEWORK ) + install ( TARGETS fluidsynth libfluidsynth + RUNTIME DESTINATION ${BIN_INSTALL_DIR} +- LIBRARY DESTINATION ${LIB_INSTALL_DIR}${LIB_SUFFIX} +- ARCHIVE DESTINATION ${LIB_INSTALL_DIR}${LIB_SUFFIX} ++ LIBRARY DESTINATION ${LIB_INSTALL_DIR} ++ ARCHIVE DESTINATION ${LIB_INSTALL_DIR} + ) + endif ( MACOSX_FRAMEWORK ) + diff --git a/fluidsynth.spec b/fluidsynth.spec index bcb8f38..11425dd 100644 --- a/fluidsynth.spec +++ b/fluidsynth.spec @@ -1,7 +1,7 @@ Summary: Real-time software synthesizer Name: fluidsynth Version: 1.1.5 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.fluidsynth.org/ Source0: http://downloads.sourceforge.net/fluidsynth/fluidsynth-%{version}.tar.bz2 License: LGPLv2+ @@ -9,6 +9,10 @@ Group: Applications/Multimedia BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: fluidsynth-libs = %{version}-%{release} +# Fix cmake usage. Upstream informed on their mailing list +# https://lists.nongnu.org/archive/html/fluid-dev/2011-08/msg00010.html +Patch0: fluidsynth-fix-cmake-usage.patch + BuildRequires: alsa-lib-devel BuildRequires: cmake BuildRequires: dbus-devel @@ -59,12 +63,13 @@ for building programs that link against fluidsynth. %prep %setup -q +%patch0 -p1 -b .cmake.usage %build mkdir -p %{_target_platform} pushd %{_target_platform} -%{cmake} -Denable-ladspa=on .. -DLIB_SUFFIX="" +%{cmake} -Denable-ladspa=on .. popd # build fluidsynth @@ -109,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Sep 16 2011 Orcan Ogetbil - 1.1.5-2 +- Fix cmake usage even more. The .pc file was broken. + * Sun Sep 04 2011 Orcan Ogetbil - 1.1.5-1 - Update to 1.1.5