packages: samba/samba.spec - system libtalloc is back (since it's available...

[arekm]

Author: arekm                        Date: Thu Aug 19 18:55:49 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- system libtalloc is back (since it's available in tarball form now)

---- Files affected:
packages/samba:
   samba.spec (1.490 -> 1.491) 

---- Diffs:

================================================================
Index: packages/samba/samba.spec
diff -u packages/samba/samba.spec:1.490 packages/samba/samba.spec:1.491
--- packages/samba/samba.spec:1.490	Thu Jul  8 14:07:31 2010
+++ packages/samba/samba.spec	Thu Aug 19 20:55:43 2010
@@ -26,6 +26,7 @@
 %bcond_without	ldap		# without LDAP support
 %bcond_without	avahi
 %bcond_without	merged_build	# without samba3+samba4 merge
+%bcond_without	system_libtalloc
 								# http://wiki.samba.org/index.php/Franky
 %bcond_with	mks		# with vfs-mks (mksd dependency not distributale)
 %bcond_with	vscan
@@ -35,6 +36,8 @@
 %undefine	with_ads
 %endif
 
+%define	libtalloc_ver	2.0.1
+
 %define		vscan_version 0.3.6c-beta5
 Summary:	SMB server
 Summary(cs.UTF-8):	Server SMB
@@ -93,6 +96,7 @@
 BuildRequires:	keyutils-devel
 BuildRequires:	libmagic-devel
 BuildRequires:	libnscd-devel
+%{?with_system_talloc:BuildRequires:	libtalloc-devel >= %{libtalloc_ver}}
 BuildRequires:	libtool >= 2:1.4d
 BuildRequires:	make >= 3.81
 BuildRequires:	ncurses-devel >= 5.2
@@ -381,7 +385,11 @@
 Summary(ru.UTF-8):	Файлы, используемые как сервером, так и клиентом Samba
 Summary(uk.UTF-8):	Файли, що використовуються як сервером, так і клієнтом Samba
 Group:		Networking/Daemons
+%if %{with system_libtalloc}
 Requires:	libtalloc >= %{epoch}:%{version}-%{release}
+%else
+Requires:	libtalloc >= %{libtalloc_ver}
+%endif
 Requires:	tdb >= %{epoch}:%{version}-%{release}
 
 %description common
@@ -1074,6 +1082,10 @@
 	--with-syslog \
 	--with-utmp \
 	--with-fhs \
+%if %{with system_libtalloc}
+	--with-libtalloc=no \
+	--enable-external-libtalloc=yes \
+%endif
 	--without-included-popt \
 	--%{?with_merged_build:en}%{!?with_merged_build:dis}able-merged-build \
 	--enable-automatic-dependencies \
@@ -1475,6 +1487,7 @@
 %{_includedir}/libsmbclient.h
 %{_includedir}/wbclient.h
 
+%if %{without system_libtalloc}
 %files -n libtalloc
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libtalloc.so.*
@@ -1483,6 +1496,7 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libtalloc.so
 %{_includedir}/talloc.h
+%endif
 
 %files -n tdb
 %defattr(644,root,root,755)
@@ -1705,6 +1719,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.491  2010/08/19 18:55:43  arekm
+- system libtalloc is back (since it's available in tarball form now)
+
 Revision 1.490  2010/07/08 12:07:31  arekm
 - release 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/samba/samba.spec?r1=1.490&r2=1.491&f=u