[libksane/f19] fix KSaneConfig.cmake

Rex Dieter rdieter at fedoraproject.org
Sat Jul 13 14:21:35 UTC 2013


commit 78fbbfa1583e187974b609c0550838a249ffa084
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Jul 13 09:21:24 2013 -0500

    fix KSaneConfig.cmake

 libksane-4.10.5-ksaneconfig.patch |   49 +++++++++++++++++++++++++++++++++++++
 libksane.spec                     |   11 +++++++-
 2 files changed, 59 insertions(+), 1 deletions(-)
---
diff --git a/libksane-4.10.5-ksaneconfig.patch b/libksane-4.10.5-ksaneconfig.patch
new file mode 100644
index 0000000..8b60637
--- /dev/null
+++ b/libksane-4.10.5-ksaneconfig.patch
@@ -0,0 +1,49 @@
+diff -up libksane-4.10.5/KSaneConfig.cmake.in.ksaneconfig libksane-4.10.5/KSaneConfig.cmake.in
+--- libksane-4.10.5/KSaneConfig.cmake.in.ksaneconfig	2013-06-28 12:36:54.799834900 -0500
++++ libksane-4.10.5/KSaneConfig.cmake.in	2013-07-13 09:20:21.827105668 -0500
+@@ -1,10 +1,36 @@
+-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")
++# Config file for libksane. Do not modify this file. Any change will be overwritten by CMake.
++
++# This file will define the following variables:
++#
++# KSANE_LIB_DIR : The libksane library directory
++# KSANE_INCLUDE_DIR : The libksane include directory
++# KSANE_VERSION : The libksane version
++# KSANE_LIBRARY : The libkane library
++# KSANE_FOUND : 
++
++get_filename_component(_currentDir ${CMAKE_CURRENT_LIST_FILE} PATH) # The current directory
++get_filename_component(rootDir ${_currentDir}/@relInstallDir@ ABSOLUTE) # The install prefix
++
++# The nepomuk-core version
++set(KSANE_VERSION_MAJOR @KSANE_LIB_MAJOR_VERSION@)
++set(KSNAE_VERSION_MINOR @KSANE_LIB_MINOR_VERSION@)
++set(KSANE_VERSION_PATCH @KSANE_LIB_PATCH_VERSION@)
++set(KSANE_VERSION ${KSANE_VERSION_MAJOR}.${KSANE_VERSION_MINOR}.${KSANE_VERSION_PATCH})
++
++# set the directories
++if(NOT KSANE_INSTALL_DIR)
++   set(KSANE_INSTALL_DIR "@CMAKE_INSTALL_PREFIX@")
++endif()
++
++# Library directory
++set(KSANE_LIB_DIR "@LIB_INSTALL_DIR@")
++
++# Include directory
++set(KSANE_INCLUDE_DIR "@INCLUDE_INSTALL_DIR@")
++set(KSANE_INCLUDE_DIRS "@INCLUDE_INSTALL_DIR@")
++
++# Set the libraries names
++set(KSANE_LIBRARY ksane)
++set(KSANE_LIBRARIES ksane)
++
+ SET(KSANE_FOUND TRUE)
diff --git a/libksane.spec b/libksane.spec
index 62260fe..36f1a74 100644
--- a/libksane.spec
+++ b/libksane.spec
@@ -1,7 +1,7 @@
 Name:    libksane
 Summary: SANE Library interface for KDE
 Version: 4.10.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: LGPLv2+
 URL:     https://projects.kde.org/projects/kde/kdegraphics/libs/libksane
@@ -13,6 +13,10 @@ URL:     https://projects.kde.org/projects/kde/kdegraphics/libs/libksane
 %endif
 Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar.xz
 
+## upstreamable patches
+# fix KSaneConfig.cmake, bug exposed by tellico FTBFS
+Patch50: libksane-4.10.5-ksaneconfig.patch
+
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: pkgconfig(sane-backends)
 
@@ -35,6 +39,8 @@ Requires: kdelibs4-devel
 %prep
 %setup -q
 
+%patch50 -p1 -b .ksaneconfig
+
 
 %build
 mkdir -p %{_target_platform}
@@ -84,6 +90,9 @@ fi
 
 
 %changelog
+* Sat Jul 13 2013 Rex Dieter <rdieter at fedoraproject.org> 4.10.5-2
+- fix KSaneConfig.cmake
+
 * Sun Jun 30 2013 Than Ngo <than at redhat.com> - 4.10.5-1
 - 4.10.5
 


More information about the scm-commits mailing list