From 9e872195b4fde10eeb687cc26c03b01bd1902806 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Mar 08 2013 17:16:22 +0000 Subject: find the Samba 4 libsmbclient.h using pkg-config (fixes FTBFS) --- diff --git a/kdebase-3.5.10-samba4.patch b/kdebase-3.5.10-samba4.patch new file mode 100644 index 0000000..5b99af8 --- /dev/null +++ b/kdebase-3.5.10-samba4.patch @@ -0,0 +1,29 @@ +diff -ur kdebase-3.5.10/kioslave/smb/configure.in.in kdebase-3.5.10-samba4/kioslave/smb/configure.in.in +--- kdebase-3.5.10/kioslave/smb/configure.in.in 2005-10-10 17:04:01.000000000 +0200 ++++ kdebase-3.5.10-samba4/kioslave/smb/configure.in.in 2013-03-08 18:05:37.000000000 +0100 +@@ -10,8 +10,9 @@ + have_libsmbclient=no + if test "x$with_samba" != xno; then + have_libsmbclient=yes +- KDE_CHECK_HEADER(libsmbclient.h, [], [have_libsmbclient=no]) +- KDE_CHECK_LIB(smbclient, smbc_new_context, [], [have_libsmbclient=no]) ++ PKG_CHECK_MODULES([SMBCLIENT], [smbclient], [], [have_libsmbclient=no]) ++ AC_SUBST(SMBCLIENT_CFLAGS) ++ AC_SUBST(SMBCLIENT_LIBS) + + SMBCLIENT_EXTRA_LIBS="" + AC_CHECK_FUNC(yp_get_default_domain, [], +diff -ur kdebase-3.5.10/kioslave/smb/Makefile.am kdebase-3.5.10-samba4/kioslave/smb/Makefile.am +--- kdebase-3.5.10/kioslave/smb/Makefile.am 2008-08-19 20:17:00.000000000 +0200 ++++ kdebase-3.5.10-samba4/kioslave/smb/Makefile.am 2013-03-08 18:08:12.000000000 +0100 +@@ -12,7 +12,9 @@ + kio_smb_internal.cpp \ + kio_smb_mount.cpp + +-kio_smb_la_LIBADD = -lkio -lsmbclient $(SMBCLIENT_EXTRA_LIBS) ++kio_smb_la_CFLAGS = $(AM_CFLAGS) $(SMBCLIENT_CFLAGS) ++ ++kio_smb_la_LIBADD = -lkio $(SMBCLIENT_LIBS) $(SMBCLIENT_EXTRA_LIBS) + + kio_smb_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) + diff --git a/kdebase3.spec b/kdebase3.spec index bc95f15..6a53d06 100644 --- a/kdebase3.spec +++ b/kdebase3.spec @@ -70,9 +70,10 @@ Patch31: kdebase-3.5.10-konsolesu-kdesu.patch Patch36: kdebase-3.5.9-userdiskmount.patch # don't link kcm_colors against libkrdb (and don't call runRdb) Patch37: kdebase-3.5.10-libkrdb_dep.patch -# fix build failture with automake-1.13 +# fix build failure with automake-1.13 Patch38: automake-missing.patch - +# find the Samba 4 libsmbclient.h using pkg-config (fixes FTBFS) +Patch39: kdebase-3.5.10-samba4.patch # http://aseigo.blogspot.com/2008/10/dear-kde3-kdesktop-users.html Patch100: kdebase-3.5.10-minicli-decimal-comma.patch @@ -235,6 +236,7 @@ Protocol handlers (KIOslaves) for personal information management, including: %patch36 -p1 -b .userdiskmount %patch37 -p1 -b .libkrdb_dep %patch38 -p1 -b .automake-1.13 +%patch39 -p1 -b .samba4 %patch100 -p1 -b .minicli-decimal-comma %patch101 -p1 -b .ossl-1.x @@ -753,6 +755,7 @@ fi %changelog * Fri Mar 08 2013 Kevin Kofler - 3.5.10-24 - reenable samba (kio_smb) +- find the Samba 4 libsmbclient.h using pkg-config (fixes FTBFS) * Thu Mar 07 2013 Than Ngo - 3.5.10-23 - fix build failure with new automake