X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=samba.spec;h=d3b024e53cfc70d3be2208a0c783a21e387d2479;hb=231cf2ab6cc9ed7c8a719720acc6b59977ebd052;hp=873922424b8d4b3b7595013b2ea1d4c856c8deee;hpb=3d62e122b9b92ac2d316291f81d58dc7bce4e511;p=packages%2Fsamba.git

diff --git a/samba.spec b/samba.spec
index 8739224..d3b024e 100644
--- a/samba.spec
+++ b/samba.spec
@@ -8,11 +8,11 @@
 %bcond_without	system_libs	# system libraries (talloc,tdb,tevent,ldb,ntdb)
 
 %if %{with system_libs}
-%define		talloc_ver	2.0.8
-%define		tdb_ver		2:1.2.12
 %define		ldb_ver		1.1.20
-%define		tevent_ver	0.9.24
-%define		ntdb_ver	0.9
+%define		ntdb_ver	1.0
+%define		talloc_ver	2:2.1.2
+%define		tdb_ver		2:1.3.6
+%define		tevent_ver	0.9.25
 %endif
 
 %include	/usr/lib/rpm/macros.perl
@@ -22,13 +22,13 @@
 Summary:	Samba Active Directory and SMB server
 Summary(pl.UTF-8):	Serwer Samba Active Directory i SMB
 Name:		samba
-Version:	4.2.1
-Release:	0.1
+Version:	4.2.5
+Release:	1
 Epoch:		1
 License:	GPL v3
 Group:		Networking/Daemons
 Source0:	https://www.samba.org/ftp/samba/samba-%{version}.tar.gz
-# Source0-md5:	614b4c7b9bbc70cff4cb56956f565741
+# Source0-md5:	12b648d062f1fb96fb633f570bb2e496
 Source1:	smb.init
 Source2:	samba.pamd
 Source4:	samba.sysconfig
@@ -47,10 +47,7 @@ Patch4:		unicodePwd-nthash-values-over-LDAP.patch
 Patch5:		%{name}-heimdal.patch
 Patch6:		server-role.patch
 Patch7:		%{name}-bug-9816.patch
-Patch8:		%{name}-lib-tls-fix-build-with-gnutls-3.4.patch
-Patch9:		%{name}-dcerpc-multiplexed.patch
-Patch10:	%{name}-refactor-dcesrv_alter-function.patch
-URL:		http://www.samba.org/
+URL:		https://www.samba.org/
 BuildRequires:	acl-devel
 %{?with_avahi:BuildRequires:	avahi-devel}
 BuildRequires:	ceph-devel >= 0.73
@@ -65,11 +62,12 @@ BuildRequires:	gamin-devel
 BuildRequires:	gdbm-devel
 BuildRequires:	gettext-tools
 BuildRequires:	glusterfs-devel
-BuildRequires:	gnutls-devel >= 1.4.0
+BuildRequires:	gnutls-devel >= 3.0.0
 BuildRequires:	heimdal-devel >= 1.5.3-1
 BuildRequires:	iconv
 BuildRequires:	keyutils-devel
 BuildRequires:	libaio-devel
+BuildRequires:	libarchive-devel >= 3.1.2
 BuildRequires:	libcap-devel
 BuildRequires:	libcom_err-devel
 BuildRequires:	libmagic-devel
@@ -77,7 +75,7 @@ BuildRequires:	libnscd-devel
 BuildRequires:	make >= 3.81
 BuildRequires:	ncurses-devel >= 5.2
 BuildRequires:	ncurses-ext-devel >= 5.2
-BuildRequires:	nss_wrapper
+BuildRequires:	nss_wrapper >= 1.0.2
 %{?with_ldap:BuildRequires:	openldap-devel >= 2.3.0}
 BuildRequires:	pam-devel >= 0.99.8.1
 BuildRequires:	perl-ExtUtils-MakeMaker
@@ -357,7 +355,7 @@ używanym w sieciach MS Windows.
 Summary:	Samba shared libraries
 Summary(pl.UTF-8):	Biblioteki współdzielone Samby
 Group:		Libraries
-Requires:	gnutls >= 1.4.0
+Requires:	gnutls >= 3.0.0
 %if %{with system_libs}
 Requires:	ldb >= %{ldb_ver}
 Requires:	ntdb >= %{ntdb_ver}
@@ -511,9 +509,6 @@ Ten pakiet zawiera schemat Samby (samba.schema) dla OpenLDAP-a.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
 
 %{__sed} -i -e 's|#!/usr/bin/env python|#!/usr/bin/python|' source4/scripting/bin/samba*
 %{__sed} -i -e 's|#!/usr/bin/env perl|#!/usr/bin/perl|' pidl/pidl