diff --git a/build-source-timestamp b/build-source-timestamp index d8a2f41..076d05a 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2582 +2583 Branch : trunk diff --git a/samba-doc.spec b/samba-doc.spec index 6ca8774..149a5c1 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -108,7 +108,6 @@ BuildRequires: ccache # requires: docbook-utils docbook-xsl-stylesheets docbook_4 freetype2 ghostscript-fonts-std ghostscript-library ghostscript-x11 libxslt sgml-skel te_etex te_latex te_pdf tetex xmlcharent %define make_doc 0 %define make_utils 0 -%define make_vscan 0 %define make_ldapsmb 1 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1120 %define cifs_init_script cifs @@ -415,7 +414,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk %changelog diff --git a/samba-vscan-0.3.6b.tar.bz2 b/samba-vscan-0.3.6b.tar.bz2 deleted file mode 100644 index 1ec5950..0000000 --- a/samba-vscan-0.3.6b.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:14f78b624b047b90ddf4965998e7115d3b3ac97b3229154a302637d8e49adcd4 -size 164471 diff --git a/samba.changes b/samba.changes index f220543..0b04811 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Aug 8 15:03:53 UTC 2011 - lmuelle@suse.de + +- Remove references to disabled vscan build. + ------------------------------------------------------------------- Thu Aug 4 17:12:25 UTC 2011 - lmuelle@suse.de diff --git a/samba.spec b/samba.spec index c2f8eb1..e51a12c 100644 --- a/samba.spec +++ b/samba.spec @@ -80,7 +80,6 @@ BuildRequires: pkgconfig %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define vscan_ver 0.3.6b %define ldapsmb_ver 1.34b License: GPLv3+ Group: Productivity/Networking/Samba @@ -104,7 +103,6 @@ Source1: vendor-files.tar.bz2 Source2: patches.tar.bz2 Source3: build-source-timestamp Source4: baselibs.conf -Source10: http://prdownloads.sourceforge.net/openantivirus/samba-vscan-%{vscan_ver}.tar.bz2 Source11: http://www.hhrm.de/~gd/ldapsmb/ldapsmb-%{ldapsmb_ver}.tar.bz2 # Choose some features / extra packages here ############################################ @@ -116,7 +114,6 @@ BuildRequires: ccache # requires: docbook-utils docbook-xsl-stylesheets docbook_4 freetype2 ghostscript-fonts-std ghostscript-library ghostscript-x11 libxslt sgml-skel te_etex te_latex te_pdf tetex xmlcharent %define make_doc 0 %define make_utils 0 -%define make_vscan 0 %define make_ldapsmb 1 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1120 %define cifs_init_script cifs @@ -187,7 +184,7 @@ Authors: The Samba Team -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk %package client @@ -227,7 +224,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -254,7 +251,7 @@ Authors: The Samba Team -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk %endif @@ -284,7 +281,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk %endif @@ -311,7 +308,7 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk %if %{make_utils} @@ -333,6 +330,9 @@ Authors: -------- The Samba Team +Source Timestamp: 2583 +Branch : trunk + %endif %package winbind @@ -361,7 +361,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -371,6 +371,7 @@ License: GPLv3+ %else %package -n libsmbclient0 + License: GPLv3+ Provides: libsmbclient = %{version}-%{release} Obsoletes: libsmbclient @@ -387,13 +388,16 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk %else %description -n libsmbclient0 +Source Timestamp: 2583 +Branch : trunk + %endif This package includes the libsmbclient library. @@ -437,7 +441,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk %package -n libnetapi0 @@ -456,7 +460,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk %package -n libnetapi-devel @@ -481,7 +485,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -491,6 +495,7 @@ License: GPLv3+ %else %package -n libsmbsharemodes0 + License: GPLv3+ %endif Summary: Samba smbsharemodes Library @@ -502,13 +507,16 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk %else %description -n libsmbsharemodes0 +Source Timestamp: 2583 +Branch : trunk + %endif This package includes the smbsharemodes library. @@ -543,7 +551,7 @@ Authors: The Samba Team -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk %package -n libwbclient0 @@ -562,7 +570,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk %package -n libwbclient-devel @@ -587,7 +595,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk %package -n libtalloc2 @@ -608,7 +616,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk %package -n libtalloc-devel @@ -635,7 +643,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk %package -n libtdb1 @@ -656,7 +664,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk %package -n libtdb-devel @@ -679,7 +687,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk %package -n libtevent0 @@ -700,7 +708,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk %package -n libtevent-devel @@ -728,7 +736,7 @@ Authors: The Samba Team -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk %package -n libldb1 @@ -751,7 +759,7 @@ Authors: The Samba Team -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk %package -n libldb-devel @@ -778,7 +786,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk %if %{make_ldapsmb} @@ -802,34 +810,9 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk -%endif -%if %{make_vscan} - -%package vscan -License: GPLv2+ -Summary: On-Access Virus Scanning with Samba -Group: Productivity/Networking/Samba -AutoReqProv: on -Version: 0.3.6b -Release: 268 -Requires: samba = %{samba_ver} -Url: http://www.openantivirus.org/ - -%description vscan -samba-vscan provides on-access scanning of Samba shares with ClamAV, -FRISK F-Prot, F-Secure AV, Kaspersky Anti-Virus, mks32, OAV -ScannerDaemon, Sophos Sweep, Symantec AntiVirus Engine (via ICAP) and -Trend Micro. - - - -Authors: --------- - Rainer Link - %endif %prep @@ -857,18 +840,6 @@ for patch in $( patches/tools/guards %{guards_symbols} > ${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba-winbind %find_lang net -# sort out vscan-modules from the main filelist -for file in $( find ${RPM_BUILD_ROOT}%{_libdir}/samba/vfs/ -mindepth 1 ! -iname '*vscan*' ); do - echo "${file#${RPM_BUILD_ROOT}}" >>${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba -done # copy the schema %__install -m 0644 examples/LDAP/samba.schema ${RPM_BUILD_ROOT}/%{_sysconfdir}/openldap/schema/samba3.schema %__install -m 0644 examples/LDAP/samba-nds.schema ${RPM_BUILD_ROOT}/%{_datadir}/samba/LDAP/samba-nds.schema @@ -1840,15 +1788,6 @@ fi %dir %{cups_lib_dir} %dir %{cups_lib_dir}/backend %ghost %{cups_lib_dir}/backend/smb -%if %{make_vscan} - -%files vscan -%defattr(-,root,root) -%{_libdir}/samba/vfs/vscan* -%doc samba-vscan-%{vscan_ver}/{AUTHORS,COPYING,ChangeLog,FAQ,INSTALL,NEWS,README,TODO} -%doc samba-vscan-%{vscan_ver}/*/vscan-*.conf -%dir %{_libdir}/samba/vfs -%endif %files -n libnetapi0 %defattr(-,root,root) diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index ee303f2..7cec4e3 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fe494221fffe97c0528ce970f0bf615ae26ad3788365c83c82ebff775a52cb71 -size 51456 +oid sha256:e82e3795b9ebf485ababf332b34d3e589879eceeb47a0793950b4d2c20b37749 +size 51454