* self-build-xbmc: add patch to fix build failure with samba

  (see BTS:0002557)


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@7517 ec354946-7b23-47d6-9f5a-488ba84defc7

nonfree/self-build-xbmc/self-build-xbmc-vl.spec

@@ -7,12 +7,13 @@ Summary:	Package to automatically build %{pkgname} rpm package
 Summary(ja): 	%{pkgname} の rpm パッケージを自動作成するパッケージ
 Name:		%{name}
 Version:	12.0
-Release: 	1%{?_dist_release}
+Release: 	2%{?_dist_release}
 Source0:	%{pkgname}-vl.spec
 Source1:	%{pkgname}.desktop
 #Source2:	%{pkgname}-%{version}-strings.xml
 #Source3:	%{pkgname}-%{version}-Confluence-strings.xml
 Source4:	%{pkgname}-%{version}-default-locale.patch
+Source5:	%{pkgname}-%{version}-use-pkgconfig-for-samba.patch
 
 License:	GPLv2+
 Group:		Restricted Software
@@ -48,7 +49,7 @@ Requires(post):	glew-devel
 Requires(post):	gperf
 Requires(post):	hal-devel
 Requires(post):	jasper-devel
-Requires(post):	java >= 1.7
+Requires(post):	java >= 1.6
 Requires(post):	libXinerama-devel
 Requires(post):	libXmu-devel
 Requires(post):	libXrandr-devel
@@ -168,6 +169,7 @@ XBMC はいくつもの賞を受賞したフリーでオープンソース (GPL)
 #%{__install} -m 644 %{SOURCE2} %{buildroot}/%{_datadir}/%{name}
 #%{__install} -m 644 %{SOURCE3} %{buildroot}/%{_datadir}/%{name}
 %{__install} -m 644 %{SOURCE4} %{buildroot}/%{_datadir}/%{name}
+%{__install} -m 644 %{SOURCE5} %{buildroot}/%{_datadir}/%{name}
 
 
 %clean
@@ -184,6 +186,9 @@ XBMC はいくつもの賞を受賞したフリーでオープンソース (GPL)
 
 
 %changelog
+* Mon Mar  4 2013 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 12.0-2
+- add patch to fix build failure with samba > 4.0 (BTS: 0002557)
+
 * Sun Feb 10 2013 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 12.0-1
 - new upstream release
 

nonfree/self-build-xbmc/xbmc-12.0-use-pkgconfig-for-samba.patch

@@ -0,0 +1,21 @@
+--- xbmc/configure.in.orig	2013-03-04 01:44:01.000000000 +0900
++++ xbmc/configure.in	2013-03-04 01:49:32.000000000 +0900
+@@ -1351,8 +1351,8 @@
+ 
+ # samba
+ if test "x$use_samba" != "xno"; then
+-  AC_CHECK_LIB([smbclient], [main],,
+-    use_samba=no;AC_MSG_ERROR($missing_library))
++  PKG_CHECK_MODULES([SMBCLIENT],[smbclient],,
++    [use_samba="no";AC_MSG_ERROR($missing_library)])
+     USE_LIBSMBCLIENT=0
+ else
+   AC_MSG_RESULT($samba_disabled)
+@@ -1360,6 +1360,7 @@
+ fi
+ 
+ if test "x$use_samba" != "xno"; then
++  INCLUDES="$INCLUDES $SMBCLIENT_CFLAGS";LIBS="$LIBS $SMBCLIENT_LIBS"
+   AC_DEFINE([HAVE_LIBSMBCLIENT], [1], [Define to 1 if you have Samba installed])
+   USE_LIBSMBCLIENT=1
+ fi

nonfree/self-build-xbmc/xbmc-vl.spec

@@ -2,7 +2,7 @@ Summary:	XBMC is a free Media Center
 Summary(ja): 	XBMC メディアセンター
 Name:		xbmc
 Version:	12.0
-Release: 	1%{?_dist_release}
+Release: 	2%{?_dist_release}
 Source0:	%{name}-%{version}.tar.gz
 Source1:	%{name}.desktop
 #i18n
@@ -12,7 +12,8 @@ Source1:	%{name}.desktop
 #lircd patch
 #Patch0:		xbmc-9.11-lircd.patch
 # change default locale and font
-Patch1:		xbmc-%{version}-default-locale.patch
+Patch1:		%{name}-%{version}-default-locale.patch
+Patch2:		%{name}-%{version}-use-pkgconfig-for-samba.patch
 License:	GPLv2+
 Group:		Applications/Multimedia
 URL:		http://xbmc.org/
@@ -45,7 +46,7 @@ BuildRequires:	glew-devel
 BuildRequires:	gperf
 BuildRequires:	hal-devel
 BuildRequires:	jasper-devel
-BuildRequires:	java >= 1.7
+BuildRequires:	java >= 1.6
 BuildRequires:	libXinerama-devel
 BuildRequires:	libXmu-devel
 BuildRequires:	libXrandr-devel
@@ -133,6 +134,7 @@ XBMC をインストールすれば、あなたの PC は多機能なマルチ
 %prep
 %setup -q
 %patch1 -p1 -b .default-locale
+%patch2 -p1 -b .use-pkgconfig-for-samba
 
 #setup language files
 #%{__cp} -f %{SOURCE10} language/Japanese/langinfo.xml
@@ -210,6 +212,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Mon Mar  4 2013 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 12.0-2
+- add patch to fix build failure with samba > 4.0 (BTS: 0002557)
+
 * Sun Feb 10 2013 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 12.0-1
 - new upstream release