Hello community, here is the log from the commit of package libcue for openSUSE:Factory checked in at 2016-07-15 12:29:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libcue (Old) and /work/SRC/openSUSE:Factory/.libcue.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libcue" Changes: -------- --- /work/SRC/openSUSE:Factory/libcue/libcue.changes 2014-10-06 12:06:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libcue.new/libcue.changes 2016-07-15 12:29:18.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Jul 6 03:50:46 UTC 2016 - tom.mbrt@googlemail.com + +- update to new upstream release 2.1.0 +* Add FLAC token support +* Clean up static vars in the parser to prevent double frees +- Add cmake.diff + +------------------------------------------------------------------- Old: ---- libcue-1.4.0.tar.bz2 New: ---- cmake.diff v2.1.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libcue.spec ++++++ --- /var/tmp/diff_new_pack.CwR585/_old 2016-07-15 12:29:19.000000000 +0200 +++ /var/tmp/diff_new_pack.CwR585/_new 2016-07-15 12:29:19.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libcue # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,19 +17,21 @@ Name: libcue -%define lname libcue1 -Version: 1.4.0 +%define lname libcue2 +Version: 2.1.0 Release: 0 Summary: CUE sheet parsing library License: GPL-2.0 Group: Development/Libraries/C and C++ Url: http://sf.net/projects/libcue/ -Source: http://downloads.sf.net/libcue/%name-%version.tar.bz2 +Source: https://github.com/lipnitsk/libcue/archive/v%version.tar.gz +Patch1: cmake.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison +BuildRequires: cmake BuildRequires: flex -BuildRequires: libtool +BuildRequires: gcc-c++ BuildRequires: pkg-config %description @@ -58,28 +60,32 @@ %prep %setup -q +%patch -P 1 -p1 %build -%configure --disable-static -make %{?_smp_mflags}; +%cmake +make %{?_smp_mflags} %install -%make_install -rm -f "%buildroot/%_libdir"/*.la; +%cmake_install +rm -f "%buildroot/%_libdir"/*.la %check -make check %{?_smp_mflags}; +export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:%buildroot/%_libdir" +# %%ctest macro unknown to SLE11_SP4, do it explicitly +cd build +ctest --output-on-failure --force-new-ctest-process %post -n %lname -p /sbin/ldconfig - %postun -n %lname -p /sbin/ldconfig %files -n %lname %defattr(-,root,root) -%_libdir/libcue.so.1* +%_libdir/libcue.so.2* %files devel %defattr(-,root,root) +%_includedir/libcue.h %_includedir/libcue*/ %_libdir/libcue.so %_libdir/pkgconfig/*.pc ++++++ cmake.diff ++++++ From: Tom Mbrt <tom.mbrt@googlemail.com> Date: Wed, 06 Jul 2016 04:25:32 +0000 Shall be removed whenever https://github.com/lipnitsk/libcue/pull/12 gets approved. --- CMakeLists.txt | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) Index: libcue-2.1.0/CMakeLists.txt =================================================================== --- libcue-2.1.0.orig/CMakeLists.txt +++ libcue-2.1.0/CMakeLists.txt @@ -7,6 +7,9 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8 FATAL PROJECT(libcue) +include(GNUInstallDirs) + + SET(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") ADD_DEFINITIONS(-DPACKAGE_VERSION="${PACKAGE_VERSION}") ADD_DEFINITIONS(-DPACKAGE_STRING="${PACKAGE_STRING}") @@ -19,7 +22,7 @@ SET (CUE_SOURCES CONFIGURE_FILE(libcue.pc.in libcue.pc @ONLY) INSTALL(FILES ${CMAKE_BINARY_DIR}/libcue.pc - DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig) + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}) INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}) # for generated files @@ -44,14 +47,14 @@ SET_TARGET_PROPERTIES (cue C_VISIBILITY_PRESET hidden) INSTALL(TARGETS cue - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib) -INSTALL(FILES ${CMAKE_SOURCE_DIR}/libcue.h DESTINATION include) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) +INSTALL(FILES ${CMAKE_SOURCE_DIR}/libcue.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) if(CMAKE_HOST_UNIX) - INSTALL(DIRECTORY DESTINATION include/libcue) + INSTALL(DIRECTORY DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libcue) INSTALL(CODE " EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ../libcue.h - \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/include/libcue/libcue.h) + \$ENV{DESTDIR}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/libcue/libcue.h) ") endif(CMAKE_HOST_UNIX)
participants (1)
-
root@hilbert.suse.de