Hello community, here is the log from the commit of package fluidsynth for openSUSE:Factory checked in at 2018-03-09 10:34:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fluidsynth (Old) and /work/SRC/openSUSE:Factory/.fluidsynth.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fluidsynth" Fri Mar 9 10:34:01 2018 rev:37 rq:583645 version:1.1.10 Changes: -------- --- /work/SRC/openSUSE:Factory/fluidsynth/fluidsynth.changes 2018-03-06 10:44:30.754300121 +0100 +++ /work/SRC/openSUSE:Factory/.fluidsynth.new/fluidsynth.changes 2018-03-09 10:34:03.481768492 +0100 @@ -1,0 +2,7 @@ +Tue Mar 6 16:09:17 UTC 2018 - [email protected] + +- Add 0001-Fix-pkgconfig-file-for-absolute-paths-347.patch + to fix pkgconfig file generation when absolute lib and include + paths are used (boo#1084081) + +------------------------------------------------------------------- New: ---- 0001-Fix-pkgconfig-file-for-absolute-paths-347.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fluidsynth.spec ++++++ --- /var/tmp/diff_new_pack.Ame7Tp/_old 2018-03-09 10:34:04.125745308 +0100 +++ /var/tmp/diff_new_pack.Ame7Tp/_new 2018-03-09 10:34:04.133745020 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + # fix build for older distros and architectures where _fillupdir is # not yet defined by using the old path as recommended by # https://en.opensuse.org/openSUSE:Packaging_Conventions_RPM_Macros#.25_fillupdir @@ -31,6 +32,7 @@ Url: http://www.fluidsynth.org/ Source: https://github.com/FluidSynth/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1000: baselibs.conf +Patch1: 0001-Fix-pkgconfig-file-for-absolute-paths-347.patch BuildRequires: cmake >= 3.0.2 BuildRequires: ladspa-devel BuildRequires: pkgconfig @@ -69,6 +71,7 @@ %prep %setup -q +%patch1 -p1 %build %cmake \ ++++++ 0001-Fix-pkgconfig-file-for-absolute-paths-347.patch ++++++ >From c98e050515718d9e46c36921407f0d4cf036dd94 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <[email protected]> Date: Tue, 6 Mar 2018 17:21:15 +0100 Subject: [PATCH] Fix pkgconfig file for absolute paths (#347) When building fluidsynth, we can use relative or absolute paths for LIB_INSTALL_DIR and INCLUDE_INSTALL_DIR. Check whether the two vars were defined absolute before writing fluidsynth.pc. Fixes https://bugzilla.opensuse.org/1084081 --- CMakeLists.txt | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 975eb83..07d64e5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -461,8 +461,16 @@ add_subdirectory ( doc ) # pkg-config support set ( prefix "${CMAKE_INSTALL_PREFIX}" ) set ( exec_prefix "\${prefix}" ) -set ( libdir "\${exec_prefix}/${LIB_INSTALL_DIR}" ) -set ( includedir "\${prefix}/${INCLUDE_INSTALL_DIR}" ) +if ( IS_ABSOLUTE "${LIB_INSTALL_DIR}" ) + set ( libdir "${LIB_INSTALL_DIR}" ) +else () + set ( libdir "\${exec_prefix}/${LIB_INSTALL_DIR}" ) +endif () +if ( IS_ABSOLUTE "${INCLUDE_INSTALL_DIR}" ) + set ( includedir "${INCLUDE_INSTALL_DIR}" ) +else () + set ( includedir "\${prefix}/${INCLUDE_INSTALL_DIR}" ) +endif () configure_file ( fluidsynth.pc.in ${CMAKE_BINARY_DIR}/fluidsynth.pc IMMEDIATE @ONLY ) install ( FILES ${CMAKE_BINARY_DIR}/fluidsynth.pc -- 2.13.6
