patch FindSamba.cmake to use pkg-config hints (#862169)
This commit is contained in:
parent
4fcf146a20
commit
83097942e5
|
@ -0,0 +1,28 @@
|
||||||
|
diff -up kdelibs-4.9.2/cmake/modules/FindSamba.cmake.samba4 kdelibs-4.9.2/cmake/modules/FindSamba.cmake
|
||||||
|
--- kdelibs-4.9.2/cmake/modules/FindSamba.cmake.samba4 2012-09-27 19:09:04.000000000 -0500
|
||||||
|
+++ kdelibs-4.9.2/cmake/modules/FindSamba.cmake 2012-10-02 07:11:38.137381941 -0500
|
||||||
|
@@ -17,10 +17,22 @@ if(SAMBA_INCLUDE_DIR AND SAMBA_LIBRARIES
|
||||||
|
set(Samba_FIND_QUIETLY TRUE)
|
||||||
|
endif(SAMBA_INCLUDE_DIR AND SAMBA_LIBRARIES)
|
||||||
|
|
||||||
|
-find_path(SAMBA_INCLUDE_DIR NAMES libsmbclient.h )
|
||||||
|
+IF (NOT WIN32)
|
||||||
|
+ # use pkg-config to get the directories and then use these values
|
||||||
|
+ # in the FIND_PATH() and FIND_LIBRARY() calls
|
||||||
|
+ find_package(PkgConfig)
|
||||||
|
+ pkg_check_modules(PC_LIBSMBCLIENT QUIET smbclient)
|
||||||
|
+ENDIF (NOT WIN32)
|
||||||
|
|
||||||
|
-find_library(SAMBA_LIBRARIES NAMES smbclient )
|
||||||
|
+find_path(SAMBA_INCLUDE_DIR NAMES libsmbclient.h
|
||||||
|
+ PATHS
|
||||||
|
+ ${PC_LIBSMBCLIENT_INCLUDEDIR}
|
||||||
|
+ ${PC_LIBSMBCLIENT_INCLUDE_DIRS})
|
||||||
|
|
||||||
|
+find_library(SAMBA_LIBRARIES NAMES smbclient
|
||||||
|
+ PATHS
|
||||||
|
+ ${PC_LIBSMBCLIENT_LIBDIR}
|
||||||
|
+ ${PC_LIBSMBCLIENT_LIB_DIRS})
|
||||||
|
|
||||||
|
if(SAMBA_INCLUDE_DIR AND SAMBA_LIBRARIES)
|
||||||
|
set(SAMBA_FOUND TRUE)
|
|
@ -25,7 +25,7 @@
|
||||||
|
|
||||||
Summary: KDE Libraries
|
Summary: KDE Libraries
|
||||||
Version: 4.9.2
|
Version: 4.9.2
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
|
|
||||||
Name: kdelibs
|
Name: kdelibs
|
||||||
Epoch: 6
|
Epoch: 6
|
||||||
|
@ -142,6 +142,9 @@ Patch53: kdelibs-4.7.2-kjs-s390.patch
|
||||||
# return valid locale (RFC 1766)
|
# return valid locale (RFC 1766)
|
||||||
Patch54: kdelibs-4.8.4-kjs-locale.patch
|
Patch54: kdelibs-4.8.4-kjs-locale.patch
|
||||||
|
|
||||||
|
# patch FindSamba.cmake to find samba4 libs (using pkg-config hints)
|
||||||
|
Patch55: kdelibs-4.9.2-FindSamba_samba4.patch
|
||||||
|
|
||||||
# backport FindKipi.cmake from Digikam SC 3.0.0-beta1 for libkipi 2 (kde#307213)
|
# backport FindKipi.cmake from Digikam SC 3.0.0-beta1 for libkipi 2 (kde#307213)
|
||||||
Patch56: kdelibs-4.9.1-FindKipi-libkipi2.patch
|
Patch56: kdelibs-4.9.1-FindKipi-libkipi2.patch
|
||||||
|
|
||||||
|
@ -313,6 +316,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
|
||||||
%patch52 -p1 -b .SOLID_UPNP
|
%patch52 -p1 -b .SOLID_UPNP
|
||||||
%patch53 -p1 -b .kjs-s390
|
%patch53 -p1 -b .kjs-s390
|
||||||
%patch54 -p1 -b .kjs-locale
|
%patch54 -p1 -b .kjs-locale
|
||||||
|
%patch55 -p1 -b .FindSamba-samba4
|
||||||
%patch56 -p1 -b .FindKipi-libkipi2
|
%patch56 -p1 -b .FindKipi-libkipi2
|
||||||
|
|
||||||
# upstream patches
|
# upstream patches
|
||||||
|
@ -571,6 +575,9 @@ rm -rf %{buildroot}
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Oct 02 2012 Rex Dieter <rdieter@fedoraproject.org> 6:4.9.2-3
|
||||||
|
- patch FindSamba.cmake to use pkg-config hints (#862169)
|
||||||
|
|
||||||
* Sat Sep 29 2012 Rex Dieter <rdieter@fedoraproject.org> 6:4.9.2-2
|
* Sat Sep 29 2012 Rex Dieter <rdieter@fedoraproject.org> 6:4.9.2-2
|
||||||
- respin
|
- respin
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue