Merge branch 'master' into DEVEL

[packages/samba4.git] / samba4.spec

diff --git a/samba4.spec b/samba4.spec
index 1ba196066c6d6810de8bc33d969517a98dcf9593..4e531686ab3f04d59e08ad3927c22010474f1ad8 100644 (file)
--- a/samba4.spec
+++ b/samba4.spec
@@ -21,7 +21,7 @@ Summary:      Active Directory server
 Summary(pl.UTF-8):     Serwer Active Directory
 Name:          samba4
 Version:       4.1.4
-Release:       2
+Release:       2.1
 Epoch:         1
 License:       GPL v3
 Group:         Networking/Daemons
@@ -315,8 +315,13 @@ 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
@@ -335,25 +340,6 @@ NetBIOS po TCP/IP (NetBT) i nie wymaga protokołu NetBEUI. Ta wersja ma
 pełne wsparcie dla blokowania plików, a także wsparcie dla kodowania
 haseł w standardzie MS i zarządzania bazą WINS.
 
-%package -n samba3-server
-Summary:       SMB server initscripts
-Summary(pl.UTF-8):     Skrypty startowe serwera SMB
-Group:         Networking/Daemons
-Requires(post,preun):  /sbin/chkconfig
-Requires:      logrotate >= 3.7-4
-Requires:      rc-scripts >= 0.4.0.12
-Requires:      samba3 = %{epoch}:%{version}-%{release}
-Requires:      setup >= 2.4.6-7
-Obsoletes:     samba < 1:4.0.0-1
-
-%description -n samba3-server
-This package contains startup scripts and services for old SMB server
-daemons (smbd, nmbd).
-
-%description -n samba3-server -l pl.UTF-8
-Ten pakiet zawiera skrypty startowe dla starych usług serwera SMB
-(smbd, nmbd).
-
 %package -n samba3-client
 Summary:       Samba client programs
 Summary(pl.UTF-8):     Klienci serwera Samba
@@ -934,22 +920,22 @@ fi
 %post -n python-samba4 -p /sbin/ldconfig
 %postun -n python-samba4 -p /sbin/ldconfig
 
-%post -n samba3-server
+%post -n samba3
 /sbin/chkconfig --add smb
 %service smb restart "Samba3 daemons"
 %systemd_post smb.service nmb.service
 
-%preun -n samba3-server
+%preun -n samba3
 if [ "$1" = "0" ]; then
        %service smb stop
        /sbin/chkconfig --del smb
 fi
 %systemd_preun smb.service nmb.service
 
-%postun -n samba3-server
+%postun -n samba3
 %systemd_reload
 
-%triggerpostun -n samba3-server -- samba < 1:4.0.0-1
+%triggerpostun -n samba3 -- samba < 1:4.0.0-1
 /sbin/chkconfig --add smb
 %service smb restart "Samba3 daemons"
 %systemd_post smb.service nmb.service
@@ -1509,6 +1495,11 @@ fi
 
 %files -n samba3
 %defattr(644,root,root,755)
+#%attr(664,root,fileshare) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/samba/smb.conf
+%attr(754,root,root) /etc/rc.d/init.d/smb
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/samba3
+%{systemdunitdir}/nmb.service
+%{systemdunitdir}/smb.service
 %attr(755,root,root) %{_bindir}/dbwrap_tool
 %attr(755,root,root) %{_bindir}/smbcontrol
 %attr(755,root,root) %{_bindir}/smbpasswd
@@ -1589,14 +1580,6 @@ fi
 %{_mandir}/man8/vfs_syncops.8*
 %{_mandir}/man8/vfs_time_audit.8*
 
-%files -n samba3-server
-%defattr(644,root,root,755)
-%attr(664,root,fileshare) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/samba/smb.conf
-%attr(754,root,root) /etc/rc.d/init.d/smb
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/samba3
-%{systemdunitdir}/nmb.service
-%{systemdunitdir}/smb.service
-
 %files -n samba3-client
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/net