Hello community, here is the log from the commit of package libksane for openSUSE:Factory checked in at 2015-01-08 23:18:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libksane (Old) and /work/SRC/openSUSE:Factory/.libksane.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libksane" Changes: -------- --- /work/SRC/openSUSE:Factory/libksane/libksane.changes 2014-11-19 20:28:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libksane.new/libksane.changes 2015-01-09 01:10:39.000000000 +0100 @@ -1,0 +2,9 @@ +Wed Dec 17 20:41:47 UTC 2014 - [email protected] + +- Update to KDE Applications 14.12.0 + * KDE Applications 14.12.0 + * See https://www.kde.org/announcements/announce-applications-14.12.0.php + +- Drop patch kde4_includes.patch due to upstream inclusion + +------------------------------------------------------------------- Old: ---- kde4_includes.patch libksane-4.14.3.tar.xz New: ---- libksane-14.12.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libksane.spec ++++++ --- /var/tmp/diff_new_pack.7bFXM9/_old 2015-01-09 01:10:40.000000000 +0100 +++ /var/tmp/diff_new_pack.7bFXM9/_new 2015-01-09 01:10:40.000000000 +0100 @@ -31,11 +31,9 @@ License: GPL-2.0+ Group: Development/Libraries/KDE Url: http://www.kde.org -Version: 4.14.3 +Version: 14.12.0 Release: 0 Source0: %{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM kde4_includes.patch -- search for includes in standard kde4 include directory (don't assume it's hardcoded to include/ ) -Patch0: kde4_includes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires @@ -45,7 +43,6 @@ %prep %setup -q -n %{name}-%version -%patch0 -p1 %build %cmake_kde4 -d build ++++++ libksane-4.14.3.tar.xz -> libksane-14.12.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-4.14.3/CMakeLists.txt new/libksane-14.12.0/CMakeLists.txt --- old/libksane-4.14.3/CMakeLists.txt 2014-06-13 14:27:35.000000000 +0200 +++ new/libksane-14.12.0/CMakeLists.txt 2014-07-10 19:21:01.000000000 +0200 @@ -61,7 +61,7 @@ ADD_DEFINITIONS(-DKDE_DEFAULT_DEBUG_AREA=51004) -CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libksane/version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/libksane/version.h) +CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libksane/version.h.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libksane/version.h) # ======================================================= @@ -81,9 +81,9 @@ ENDIF (SANE_FOUND) IF(NOT WIN32) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libksane.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libksane.pc) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libksane.lsm.cmake ${CMAKE_CURRENT_BINARY_DIR}/libksane.lsm) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libksane.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig ) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/templates/libksane.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libksane.pc) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/templates/libksane.lsm.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libksane.lsm) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libksane.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig ) ENDIF(NOT WIN32) macro_display_feature_log() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-4.14.3/KSaneConfig.cmake.in new/libksane-14.12.0/KSaneConfig.cmake.in --- old/libksane-4.14.3/KSaneConfig.cmake.in 2014-06-13 14:27:35.000000000 +0200 +++ new/libksane-14.12.0/KSaneConfig.cmake.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -GET_FILENAME_COMPONENT(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) -GET_FILENAME_COMPONENT(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) -GET_FILENAME_COMPONENT(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) -GET_FILENAME_COMPONENT(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) - -find_library(KSANE_LIBRARY NAMES ksane HINTS ${_IMPORT_PREFIX}/lib NO_DEFAULT_PATH) -find_path(KSANE_INCLUDE_DIR NAMES libksane/ksane.h HINTS ${_IMPORT_PREFIX}/include NO_DEFAULT_PATH) -SET(KSANE_LIBRARY "${KSANE_LIBRARY}" CACHE FILEPATH "KSane image scanning library") -SET(KSANE_INCLUDE_DIR "${KSANE_INCLUDE_DIR}" CACHE PATH "Include path for KSane library") -SET(KSANE_FOUND TRUE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-4.14.3/cmake/templates/KSaneConfig.cmake.in new/libksane-14.12.0/cmake/templates/KSaneConfig.cmake.in --- old/libksane-4.14.3/cmake/templates/KSaneConfig.cmake.in 1970-01-01 01:00:00.000000000 +0100 +++ new/libksane-14.12.0/cmake/templates/KSaneConfig.cmake.in 2014-07-10 19:21:01.000000000 +0200 @@ -0,0 +1,10 @@ +GET_FILENAME_COMPONENT(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) +GET_FILENAME_COMPONENT(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +GET_FILENAME_COMPONENT(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +GET_FILENAME_COMPONENT(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) + +find_library(KSANE_LIBRARY NAMES ksane HINTS ${_IMPORT_PREFIX}/lib NO_DEFAULT_PATH) +find_path(KSANE_INCLUDE_DIR NAMES libksane/ksane.h HINTS ${_IMPORT_PREFIX}/include NO_DEFAULT_PATH) +SET(KSANE_LIBRARY "${KSANE_LIBRARY}" CACHE FILEPATH "KSane image scanning library") +SET(KSANE_INCLUDE_DIR "${KSANE_INCLUDE_DIR}" CACHE PATH "Include path for KSane library") +SET(KSANE_FOUND TRUE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-4.14.3/cmake/templates/libksane.lsm.cmake.in new/libksane-14.12.0/cmake/templates/libksane.lsm.cmake.in --- old/libksane-4.14.3/cmake/templates/libksane.lsm.cmake.in 1970-01-01 01:00:00.000000000 +0100 +++ new/libksane-14.12.0/cmake/templates/libksane.lsm.cmake.in 2014-07-10 19:21:01.000000000 +0200 @@ -0,0 +1,15 @@ +Begin4 +Title: libksane +Version: ${KSANE_LIB_VERSION_STRING} +Entered-date: 2007-09-13 +Description: libksane is a C++ library for SANE interface to control flat scanners. +Keywords: kde image sane scanner digiKam kipi-plugins +Author: caulier dot gilles at gmail dot com (Gilles Caulier) + kare dot sars at iki dot fi (Kare Sars) +Maintained-by: +Primary-site: http://www.digikam.org +Alternate-site: http://www.digikam.org +Original-site: +Platforms: +Copying-policy: LGPL +End diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-4.14.3/cmake/templates/libksane.pc.cmake.in new/libksane-14.12.0/cmake/templates/libksane.pc.cmake.in --- old/libksane-4.14.3/cmake/templates/libksane.pc.cmake.in 1970-01-01 01:00:00.000000000 +0100 +++ new/libksane-14.12.0/cmake/templates/libksane.pc.cmake.in 2014-07-10 19:21:01.000000000 +0200 @@ -0,0 +1,12 @@ +prefix=${CMAKE_INSTALL_PREFIX} +exec_prefix=${BIN_INSTALL_DIR} +libdir=${LIB_INSTALL_DIR} +includedir=${INCLUDE_INSTALL_DIR} + +Name: libksane +Description: libksane is a C++ library for SANE interface to control flat scanners. +URL: http://www.digikam.org +Requires: +Version: ${KSANE_LIB_VERSION_STRING} +Libs: -L${LIB_INSTALL_DIR} -lksane +Cflags: -I${INCLUDE_INSTALL_DIR} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-4.14.3/ksanetwain/CMakeLists.txt new/libksane-14.12.0/ksanetwain/CMakeLists.txt --- old/libksane-4.14.3/ksanetwain/CMakeLists.txt 2014-06-13 14:27:35.000000000 +0200 +++ new/libksane-14.12.0/ksanetwain/CMakeLists.txt 2014-07-10 19:21:01.000000000 +0200 @@ -1,14 +1,11 @@ -CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/../libksane/version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/version.h) +CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/../libksane/version.h.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/version.h) - -INCLUDE_DIRECTORIES( - ${CMAKE_CURRENT_SOURCE_DIR}/../libksane - ${CMAKE_CURRENT_BINARY_DIR} -) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libksane + ${CMAKE_CURRENT_BINARY_DIR}) IF( WIN32 ) ADD_DEFINITIONS( -DMAKE_KSANE_LIB ) -ENDIF( WIN32 ) +ENDIF() set(ktwain_src twainiface.cpp @@ -17,7 +14,6 @@ KDE4_ADD_LIBRARY(ksane SHARED ${ktwain_src}) - TARGET_LINK_LIBRARIES(ksane ${KDE4_KDEUI_LIBS}) SET_TARGET_PROPERTIES(ksane PROPERTIES @@ -33,11 +29,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/version.h DESTINATION ${INCLUDE_INSTALL_DIR}/libksane COMPONENT Devel) -configure_file( - ../KSaneConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/KSaneConfig.cmake @ONLY -) +configure_file(../cmake/templates/KSaneConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/KSaneConfig.cmake @ONLY) -install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/KSaneConfig.cmake - DESTINATION ${LIB_INSTALL_DIR}/cmake/KSane -) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/KSaneConfig.cmake + DESTINATION ${LIB_INSTALL_DIR}/cmake/KSane) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-4.14.3/libksane/CMakeLists.txt new/libksane-14.12.0/libksane/CMakeLists.txt --- old/libksane-4.14.3/libksane/CMakeLists.txt 2014-06-13 14:27:35.000000000 +0200 +++ new/libksane-14.12.0/libksane/CMakeLists.txt 2014-07-10 19:21:01.000000000 +0200 @@ -59,12 +59,7 @@ KDE4_INSTALL_ICONS(${ICON_INSTALL_DIR}) +CONFIGURE_FILE(../cmake/templates/KSaneConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/KSaneConfig.cmake @ONLY) -CONFIGURE_FILE( - ../KSaneConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/KSaneConfig.cmake @ONLY -) - -INSTALL( - FILES ${CMAKE_CURRENT_BINARY_DIR}/KSaneConfig.cmake - DESTINATION ${LIB_INSTALL_DIR}/cmake/KSane -) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/KSaneConfig.cmake + DESTINATION ${LIB_INSTALL_DIR}/cmake/KSane) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-4.14.3/libksane/version.h.cmake new/libksane-14.12.0/libksane/version.h.cmake --- old/libksane-4.14.3/libksane/version.h.cmake 2014-06-13 14:27:35.000000000 +0200 +++ new/libksane-14.12.0/libksane/version.h.cmake 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ -/* ============================================================ - * - * This file is a part of kipi-plugins project - * http://www.digikam.org - * - * Date : 2007-02-12 - * Description : Sane interface for KDE - * - * Copyright (C) 2007 by Gilles Caulier <caulier dot gilles at gmail dot com> - * - * This program is free software; you can redistribute it - * and/or modify it under the terms of the GNU General - * Public License as published by the Free Software Foundation; - * either version 2, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * ============================================================ */ - -#ifndef KSANE_VERSION_H -#define KSANE_VERSION_H - -static const char ksane_version[] = "${KSANE_LIB_VERSION_STRING}"; - -#define KSANE_VERSION ${KSANE_LIB_VERSION_ID} - -#endif // KSANE_VERSION_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-4.14.3/libksane/version.h.cmake.in new/libksane-14.12.0/libksane/version.h.cmake.in --- old/libksane-4.14.3/libksane/version.h.cmake.in 1970-01-01 01:00:00.000000000 +0100 +++ new/libksane-14.12.0/libksane/version.h.cmake.in 2014-07-10 19:21:01.000000000 +0200 @@ -0,0 +1,30 @@ +/* ============================================================ + * + * This file is a part of kipi-plugins project + * http://www.digikam.org + * + * Date : 2007-02-12 + * Description : Sane interface for KDE + * + * Copyright (C) 2007 by Gilles Caulier <caulier dot gilles at gmail dot com> + * + * This program is free software; you can redistribute it + * and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; + * either version 2, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * ============================================================ */ + +#ifndef KSANE_VERSION_H +#define KSANE_VERSION_H + +static const char ksane_version[] = "${KSANE_LIB_VERSION_STRING}"; + +#define KSANE_VERSION ${KSANE_LIB_VERSION_ID} + +#endif // KSANE_VERSION_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-4.14.3/libksane.lsm.cmake new/libksane-14.12.0/libksane.lsm.cmake --- old/libksane-4.14.3/libksane.lsm.cmake 2014-06-13 14:27:35.000000000 +0200 +++ new/libksane-14.12.0/libksane.lsm.cmake 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -Begin4 -Title: libksane -Version: ${KSANE_LIB_VERSION_STRING} -Entered-date: 2007-09-13 -Description: libksane is a C++ library for SANE interface to control flat scanners. -Keywords: kde image sane scanner digiKam kipi-plugins -Author: caulier dot gilles at gmail dot com (Gilles Caulier) - kare dot sars at iki dot fi (Kare Sars) -Maintained-by: -Primary-site: http://www.digikam.org -Alternate-site: http://www.digikam.org -Original-site: -Platforms: -Copying-policy: LGPL -End diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-4.14.3/libksane.pc.cmake new/libksane-14.12.0/libksane.pc.cmake --- old/libksane-4.14.3/libksane.pc.cmake 2014-06-13 14:27:35.000000000 +0200 +++ new/libksane-14.12.0/libksane.pc.cmake 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -prefix=${CMAKE_INSTALL_PREFIX} -exec_prefix=${BIN_INSTALL_DIR} -libdir=${LIB_INSTALL_DIR} -includedir=${INCLUDE_INSTALL_DIR} - -Name: libksane -Description: libksane is a C++ library for SANE interface to control flat scanners. -URL: http://www.digikam.org -Requires: -Version: ${KSANE_LIB_VERSION_STRING} -Libs: -L${LIB_INSTALL_DIR} -lksane -Cflags: -I${INCLUDE_INSTALL_DIR} -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
