[packages/samba4/DEVEL: 7/7] Merge branch 'master' into DEVEL
baggins
baggins at pld-linux.org
Fri Jan 10 20:14:58 CET 2014
commit 02bb167a4725da91d458b7b1e99632fe24672fe0
Merge: f3148e3 85767e3
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Fri Jan 10 20:14:26 2014 +0100
Merge branch 'master' into DEVEL
samba4.spec | 71 +++++++++++++++++++++++++++++--------------------------------
1 file changed, 34 insertions(+), 37 deletions(-)
---
diff --cc samba4.spec
index 2a1da6a,1ba1960..4e53168
--- a/samba4.spec
+++ b/samba4.spec
@@@ -22,8 -20,8 +20,8 @@@
Summary: Active Directory server
Summary(pl.UTF-8): Serwer Active Directory
Name: samba4
- Version: 4.1.3
+ Version: 4.1.4
-Release: 2
+Release: 2.1
Epoch: 1
License: GPL v3
Group: Networking/Daemons
@@@ -312,17 -311,12 +311,17 @@@ przez narzędzia testowe dla serwerów
Summary: SMB server
Summary(pl.UTF-8): Serwer SMB
Group: Networking/Daemons
- Requires: samba3-common = %{epoch}:%{version}-%{release}
Requires: %{name}-common-server = %{epoch}:%{version}-%{release}
+ Requires: samba3-common = %{epoch}:%{version}-%{release}
# smbd links with libcups
%{?with_cups:Requires: cups-lib >= 1:1.2.0}
+Requires: logrotate >= 3.7-4
+Requires: rc-scripts >= 0.4.0.12
+Requires: setup >= 2.4.6-7
+Obsoletes: samba < 1:4.0.0-1
Obsoletes: samba-pdb-xml
Obsoletes: samba-vfs-block
+Obsoletes: samba3-server < 1:4.1.3-2.1
%description -n samba3
Samba provides an SMB server which can be used to provide network
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/samba4.git/commitdiff/02bb167a4725da91d458b7b1e99632fe24672fe0
More information about the pld-cvs-commit
mailing list