[xine-lib] find the Samba 4 libsmbclient.h using pkg-config, fixes FTBFS (#909825)

[Kevin Kofler]

commit 1b121475e097285d896c8554ce377487b11c393d
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Tue Feb 12 15:55:25 2013 +0100

    find the Samba 4 libsmbclient.h using pkg-config, fixes FTBFS (#909825)
    
    * Tue Feb 12 2013 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.1.21-5
    - find the Samba 4 libsmbclient.h using pkg-config, fixes FTBFS (#909825)

 xine-lib-1.1.21-samba4.patch |   32 ++++++++++++++++++++++++++++++++
 xine-lib.spec                |   16 +++++++++++-----
 2 files changed, 43 insertions(+), 5 deletions(-)
---
diff --git a/xine-lib-1.1.21-samba4.patch b/xine-lib-1.1.21-samba4.patch
new file mode 100644
index 0000000..6c5f67d
--- /dev/null
+++ b/xine-lib-1.1.21-samba4.patch
@@ -0,0 +1,32 @@
+diff -ur xine-lib-1.1.21/configure.ac xine-lib-1.1.21-samba4/configure.ac
+--- xine-lib-1.1.21/configure.ac	2012-07-16 21:42:38.000000000 +0200
++++ xine-lib-1.1.21-samba4/configure.ac	2013-02-12 15:44:33.000000000 +0100
+@@ -1698,12 +1698,10 @@
+   [with_samba=$enableval], [with_samba=yes])
+ 
+ if test "x$with_samba" = "xyes"; then
+-  AC_CHECK_LIB(smbclient, smbc_init,
+-	[ AC_CHECK_HEADER(libsmbclient.h,
+-		[ have_libsmbclient=yes
+-		  LIBSMBCLIENT_LIBS="-lsmbclient" ], 
+-		AC_MSG_RESULT([*** All libsmbclient dependent parts will be disabled ***]))],
+-	AC_MSG_RESULT([*** All libsmbclient dependent parts will be disabled ***]))
++  PKG_CHECK_MODULES([LIBSMBCLIENT], [smbclient],
++    [have_libsmbclient=yes],
++    AC_MSG_RESULT(*** All libsmbclient dependent parts will be disabled ***))
++  AC_SUBST(LIBSMBCLIENT_CFLAGS)
+   AC_SUBST(LIBSMBCLIENT_LIBS)
+ fi
+ AM_CONDITIONAL(HAVE_LIBSMBCLIENT, test "x$have_libsmbclient" = "xyes")
+diff -ur xine-lib-1.1.21/src/input/Makefile.am xine-lib-1.1.21-samba4/src/input/Makefile.am
+--- xine-lib-1.1.21/src/input/Makefile.am	2012-07-16 21:42:38.000000000 +0200
++++ xine-lib-1.1.21-samba4/src/input/Makefile.am	2013-02-12 15:46:45.000000000 +0100
+@@ -150,7 +150,7 @@
+ 
+ xineplug_inp_smb_la_SOURCES = input_smb.c
+ xineplug_inp_smb_la_LIBADD = $(XINE_LIB) $(LIBSMBCLIENT_LIBS) $(LTLIBINTL)
+-xineplug_inp_smb_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS)
++xineplug_inp_smb_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) $(LIBSMBCLIENT_CFLAGS)
+ xineplug_inp_smb_la_LDFLAGS = $(xineplug_ldflags)
+ 
+ xineplug_inp_pvr_la_SOURCES = input_pvr.c
diff --git a/xine-lib.spec b/xine-lib.spec
index 1e701eb..ebfe4e0 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -30,7 +30,7 @@
 Summary:        A multimedia engine
 Name:           xine-lib
 Version:        1.1.21
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://www.xine-project.org/
@@ -44,9 +44,11 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:         xine-lib-1.1.19-no_autopoint.patch
 Patch1:         xine-lib-1.1.4-optflags.patch
 # http://bugzilla.redhat.com/470568
-Patch8:         xine-lib-1.1.17-avsync_hack.patch
+Patch2:         xine-lib-1.1.17-avsync_hack.patch
 # http://bugzilla.redhat.com/477226
-Patch9:         xine-lib-1.1.16.2-multilib.patch
+Patch3:         xine-lib-1.1.16.2-multilib.patch
+# find the Samba 4 libsmbclient.h using pkg-config (#909825)
+Patch4:         xine-lib-1.1.21-samba4.patch
 
 Provides:         xine-lib(plugin-abi) = %{plugin_abi}
 %{?_isa:Provides: xine-lib(plugin-abi)%{?_isa} = %{plugin_abi}}
@@ -151,8 +153,9 @@ This package contains extra plugins for %{name}:
 # extra work for to omit old libtool-related crud
 rm -f configure ltmain.sh libtool m4/libtool.m4 m4/ltoptions.m4 m4/ltversion.m4
 %patch1 -p1 -b .optflags
-%patch8 -p1 -b .avsync_hack
-%patch9 -p1 -b .multilib
+%patch2 -p1 -b .avsync_hack
+%patch3 -p1 -b .multilib
+%patch4 -p1 -b .samba4
 
 ./autogen.sh noconfig
 
@@ -387,6 +390,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Feb 12 2013 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.1.21-5
+- find the Samba 4 libsmbclient.h using pkg-config, fixes FTBFS (#909825)
+
 * Mon Sep 17 2012 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.1.21-4
 - rebuild for new directfb