diff --git a/.gitignore b/.gitignore index 4dca9ab..6618493 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ fluidsynth-1.1.1.tar.gz /fluidsynth-1.1.3.tar.bz2 /fluidsynth-1.1.4.tar.bz2 /fluidsynth-1.1.5.tar.bz2 +/fluidsynth-1.1.6.tar.bz2 diff --git a/fluidsynth-fix-cmake-usage.patch b/fluidsynth-fix-cmake-usage.patch index 11127c7..836398c 100644 --- a/fluidsynth-fix-cmake-usage.patch +++ b/fluidsynth-fix-cmake-usage.patch @@ -1,25 +1,25 @@ -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 ) +diff -rupN fluidsynth-1.1.6.old/CMakeLists.txt fluidsynth-1.1.6/CMakeLists.txt +--- fluidsynth-1.1.6.old/CMakeLists.txt 2012-08-16 00:01:13.000000000 -0400 ++++ fluidsynth-1.1.6/CMakeLists.txt 2012-08-19 18:42:16.309818347 -0400 +@@ -407,12 +407,12 @@ add_subdirectory ( doc ) + # 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 + # Extra targets for Unix build environments + if ( UNIX ) +diff -rupN fluidsynth-1.1.6.old/src/CMakeLists.txt fluidsynth-1.1.6/src/CMakeLists.txt +--- fluidsynth-1.1.6.old/src/CMakeLists.txt 2012-08-16 00:01:13.000000000 -0400 ++++ fluidsynth-1.1.6/src/CMakeLists.txt 2012-08-19 18:42:41.949715415 -0400 @@ -324,8 +324,8 @@ if ( MACOSX_FRAMEWORK ) else ( MACOSX_FRAMEWORK ) install ( TARGETS fluidsynth libfluidsynth diff --git a/fluidsynth.spec b/fluidsynth.spec index a46a43d..491fd8e 100644 --- a/fluidsynth.spec +++ b/fluidsynth.spec @@ -1,7 +1,7 @@ Summary: Real-time software synthesizer Name: fluidsynth -Version: 1.1.5 -Release: 5%{?dist} +Version: 1.1.6 +Release: 1%{?dist} URL: http://www.fluidsynth.org/ Source0: http://downloads.sourceforge.net/fluidsynth/fluidsynth-%{version}.tar.bz2 License: LGPLv2+ @@ -107,6 +107,9 @@ make DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform} install %changelog +* Tue Aug 21 2012 Orcan Ogetbil - 1.1.6-1 +- Update to 1.1.6 + * Thu Jul 19 2012 Fedora Release Engineering - 1.1.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 2743bcd..5d4ede0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -835b98b0ddedbb9cc24b53d66cf900c3 fluidsynth-1.1.5.tar.bz2 +f6e696690e989098f70641364fdffad7 fluidsynth-1.1.6.tar.bz2