- version 3.0.14a

[packages/samba.git] / samba.spec

diff --git a/samba.spec b/samba.spec
index e26a12cfd6909de896705366464f6084676d8d8d..ab9cdab914675e4735cb63e87a5cd1d2b3fdb2a4 100644 (file)
--- a/samba.spec
+++ b/samba.spec
@@ -1,11 +1,6 @@
 #
 # TODO:
-# - fix Summary and Description for python-samba package
 # - look into other distro specs for valid %descriptions for samba 3
-# - review configure options
-# - fix broken --without ldap, test functionality with other bconds
-# - check tdbtool (with tdb.spec)
-# - when pl for openldap-schema-samba done, rel up and STBR
 #
 # Conditional build:
 %bcond_without ads             # without ActiveDirectory support
@@ -16,12 +11,12 @@
 %bcond_without pgsql           # without PostgreSQL support
 %bcond_without python          # without python libs/utils
 %bcond_with    ldapsam         # with LDAP SAM 2.2 based auth (instead of smbpasswd)
-#
+
 # ADS requires krb5 and LDAP
 %if %{without krb5} || %{without ldap}
 %undefine      with_ads
 %endif
-%define                vscan_version 0.3.5
+%define                vscan_version 0.3.6
 Summary:       SMB server
 Summary(cs):   Server SMB
 Summary(da):   SMB server
@@ -39,13 +34,13 @@ Summary(tr):        SMB sunucusu
 Summary(uk):   SMB Ë̦¤ÎÔ ÔÁ ÓÅÒ×ÅÒ
 Summary(zh_CN):        Samba ¿Í»§¶ËºÍ·þÎñÆ÷
 Name:          samba
-Version:       3.0.11
-Release:       2.3
+Version:       3.0.14a
+Release:       0.1
 Epoch:         1
 License:       GPL v2
 Group:         Networking/Daemons
 Source0:       http://us1.samba.org/samba/ftp/%{name}-%{version}.tar.gz
-# Source0-md5: 217e489646a474b4fb69d5802c14bc6e
+# Source0-md5: ebee37e66a8b5f6fd328967dc09088e8
 Source1:       smb.init
 Source2:       %{name}.pamd
 Source3:       swat.inetd
@@ -53,7 +48,7 @@ Source4:      %{name}.sysconfig
 Source5:       %{name}.logrotate
 Source6:       smb.conf
 Source7:       http://dl.sourceforge.net/openantivirus/%{name}-vscan-%{vscan_version}.tar.bz2
-# Source7-md5: 5f173d549014985d681478897135915b
+# Source7-md5: 68c9d099d942d85e68d96804b26ac788
 Source8:       winbind.init
 Source9:       winbind.sysconfig
 Patch0:                %{name}-statfs-workaround.patch
@@ -67,6 +62,7 @@ BuildRequires:        autoconf
 BuildRequires: automake
 %{?with_cups:BuildRequires:    cups-devel}
 %{?with_krb5:BuildRequires:    heimdal-devel}
+BuildRequires: libmagic-devel
 BuildRequires: libtool >= 2:1.4d
 BuildRequires: libxml2-devel
 %if %{with mysql}
@@ -115,8 +111,7 @@ WINS database management.
 
 Please refer to the WHATSNEW.txt document for fixup information. This
 binary release includes encrypted password support. Please read the
-smb.conf file and ENCRYPTION.txt in the docs directory for
-implementation details.
+smb.conf file for implementation details.
 
 %description -l cs
 Samba poskytuje server SMB, který lze pou¾ít pro poskytování sí»ových
@@ -196,9 +191,7 @@ SWAT(Samba Web Administration Tool)
 TCP 901 Æ÷Æ®¸¦ »ç¿ëÇÏ°Ô µÈ´Ù.
 
 ÃÖ±Ù Á¤º¸·Î WHATSNEW.txt ÆÄÀÏÀÇ ¹®¼­¸¦ Âü°íÇϵµ·Ï ÇÑ´Ù. ¹ÙÀ̳ʸ®ÀÇ
-¸±¸®Áî´Â ¾ÏȣȭµÈ Æнº¿öµå¸¦ Á¦°øÇÑ´Ù. ±¸Çö¿¡ ´ëÇÑ ÀÚ¼¼ÇÑ Á¤º¸¸¦ ¾ò±â
-À§ÇØ docs µð·ºÅ丮³»¿¡ ÀÖ´Â smb.conf ÆÄÀÏ°ú ENCRYPTION.txt ÆÄÀÏÀ»
-Àо´Ù.
+¸±¸®Áî´Â ¾ÏȣȭµÈ Æнº¿öµå¸¦ Á¦°øÇÑ´Ù.
 
 %description -l pl
 Samba udostêpnia serwer SMB, który mo¿e byæ u¿yty w celu dostarczenia
@@ -681,6 +674,22 @@ VFS module to make automatic copy of data in samba share.
 %description vfs-shadow_copy -l pl
 Modu³ VFS do tworzenia automatycznych kopii danych w zasobach samby.
 
+%package vfs-vscan-antivir
+Summary:        On-access virus scanning for samba using AntiVir
+Summary(pl):    Skaner antywirusowy online wykorzystuj±cy AntiVir
+Group:          Networking/Daemons
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+Provides:       %{name}-vscan = %{epoch}:%{version}-%{release}
+
+%description vfs-vscan-antivir
+A vfs-module for samba to implement on-access scanning using the
+AntiVir antivirus software (which must be installed to use this).
+
+%description vfs-vscan-antivir -l pl
+Modu³ vfs do samby implementuj±cy skaning antywirusowy w czasie
+dostêpu do plików korzystaj±c z oprogramowania antywirusowego AntiVir
+(które musi byæ zainstalowane, aby wykorzystaæ ten modu³).
+
 %package vfs-vscan-clamav
 Summary:       On-access virus scanning for samba using ClamAV
 Summary(pl):   Skaner antywirusowy online wykorzystuj±cy ClamAV
@@ -860,6 +869,7 @@ dost
 
 %package -n openldap-schema-samba
 Summary:       Samba LDAP schema
+Summary(pl):   Schemat LDAP dla samby
 Group:         Networking/Daemons
 Requires(post,postun): sed >= 4.0
 Requires:      openldap-servers
@@ -867,6 +877,9 @@ Requires:   openldap-servers
 %description -n openldap-schema-samba
 This package contains samba.schema for openldap.
 
+%description -n openldap-schema-samba -l pl
+Ten pakiet zawiera schemat samby dla openldap-a.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -974,7 +987,7 @@ install source/include/libsmbclient.h $RPM_BUILD_ROOT%{_includedir}
 
 # vscan modules
 install examples/VFS/samba-vscan-%{vscan_version}/*.so $RPM_BUILD_ROOT%{_vfsdir}
-install examples/VFS/samba-vscan-%{vscan_version}/{clamav,fprot,icap,kaspersky,mks,openantivirus,sophos,trend,f-secure,nai}/*.conf $RPM_BUILD_ROOT%{_sysconfdir}/samba
+install examples/VFS/samba-vscan-%{vscan_version}/{antivir,clamav,fprot,icap,kaspersky,mks,openantivirus,sophos,trend,f-secure,nai}/*.conf $RPM_BUILD_ROOT%{_sysconfdir}/samba
 
 touch $RPM_BUILD_ROOT/var/lock/samba/{STATUS..LCK,wins.dat,browse.dat}
 
@@ -1002,7 +1015,9 @@ cp -R source/build/lib.*/samba $RPM_BUILD_ROOT%{py_sitedir}
 
 mv $RPM_BUILD_ROOT%{_bindir}/tdbtool $RPM_BUILD_ROOT%{_bindir}/tdbtool_samba
 
+%if %{with ldap}
 install examples/LDAP/samba.schema $RPM_BUILD_ROOT%{schemadir}
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -1067,7 +1082,7 @@ include           %{schemadir}/samba.schema
 fi
 
 if [ -f /var/lock/subsys/ldap ]; then
-    /etc/rc.d/init.d/ldap restart >&2
+       /etc/rc.d/init.d/ldap restart >&2
 fi
 
 %postun -n openldap-schema-samba
@@ -1335,6 +1350,12 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_vfsdir}/shadow_copy.so
 
+%files vfs-vscan-antivir
+%defattr(644,root,root,755)
+#%doc examples/VFS/%{name}-vscan-%{vscan_version}/{INSTALL,FAQ}
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/samba/vscan-antivir.conf
+%attr(755,root,root) %{_vfsdir}/vscan-antivir.so
+
 %files vfs-vscan-clamav
 %defattr(644,root,root,755)
 #%doc examples/VFS/%{name}-vscan-%{vscan_version}/{INSTALL,FAQ}
@@ -1397,6 +1418,8 @@ fi
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/samba/vscan-trend.conf
 %attr(755,root,root) %{_vfsdir}/vscan-trend.so
 
+%if %{with ldap}
 %files -n openldap-schema-samba
 %defattr(644,root,root,755)
 %{schemadir}/*.schema
+%endif