Kolab Groupware OBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 4

clamav.spec Changed

@@ -1,16 +1,10 @@
 #global prerelease	rc1
 
-%if 0%{?opensuse_bs} < 1
-## Fedora Extras specific customization below...
-%bcond_without		fedora
-%bcond_without		upstart
-%bcond_with		systemd
-%bcond_with		sysv
-%bcond_without		tmpfiles
-%bcond_with		unrar
-%bcond_without		noarch
-%bcond_without		bytecode
-##
+%if 0%{?suse_version} || 0%{?fedora} > 17 || 0%{?rhel} > 6
+%global with_systemd 1
+%{!?_unitdir:   %global _unitdir /usr/lib/systemd/system/}
+%else
+%global with_systemd 0
 %endif
 
 %global _hardened_build	1
@@ -21,63 +15,60 @@
 %global have_ocaml	0
 %endif
 
-%global username	clamupdate
-%global homedir		%_var/lib/clamav
-%global freshclamlog	%_var/log/freshclam.log
-%global milteruser	clamilt
-%global milterlog	%_var/log/clamav-milter.log
-%global milterstatedir	%_var/run/clamav-milter
-%global pkgdatadir	%_datadir/%name
+%global username        clamupdate
+%global homedir         %{_var}/lib/clamav
+%global freshclamlog    %{_var}/log/freshclam.log
+%global milteruser      clamilt
+%global milterlog       %{_var}/log/clamav-milter.log
+%global milterstatedir  %{_var}/run/clamav-milter
+%global pkgdatadir      %{_datadir}/%{name}
 
 %global scanuser	clamscan
 %global scanstatedir	%_var/run/clamd.scan
 
-%{?with_noarch:%global noarch	BuildArch:	noarch}
-%{!?_unitdir:%global _unitdir /lib/systemd/system}
+%{!?_unitdir:%global _unitdir /usr/lib/systemd/system}
 %{!?_initrddir:%global _initrddir /etc/rc.d/init.d}
 %{!?release_func:%global release_func() %%{?prerelease:0.}%1%%{?prerelease:.%%prerelease}%%{?dist}}
 %{!?apply:%global  apply(p:n:b:) %patch%%{-n:%%{-n*}} %%{-p:-p %%{-p*}} %%{-b:-b %%{-b*}} \
 %nil}
-%{!?systemd_reqs:%global systemd_reqs \
-Requires(post):		 /bin/systemctl\
-Requires(preun):	 /bin/systemctl\
-Requires(postun):	 /bin/systemctl\
-%nil}
 
-Summary:	End-user tools for the Clam Antivirus scanner
-Name:		clamav
-Version:	0.98.4
-Release:	1%{?dist}
-License:	%{?with_unrar:proprietary}%{!?with_unrar:GPLv2}
-Group:		Applications/File
-URL:		http://www.clamav.net
+Summary:	        End-user tools for the Clam Antivirus scanner
+Name:		        clamav
+Version:	        0.98.4
+Release:	        1%{?dist}
+License:	        %{?with_unrar:proprietary}%{!?with_unrar:GPLv2}
+Group:		        Applications/File
+URL:		        http://www.clamav.net
+
 %if 0%{?with_unrar:1}
-Source0:	http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?prerelease}.tar.gz
-Source999:	http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?prerelease}.tar.gz.sig
+Source0:	        http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}%{?prerelease}.tar.gz
+Source999:	        http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}%{?prerelease}.tar.gz.sig
 %else
 # Unfortunately, clamav includes support for RAR v3, derived from GPL
 # incompatible unrar from RARlabs. We have to pull this code out.
 # tarball was created by
 #  make clean-sources NAME=clamav VERSION=<version> TARBALL=clamav-<version>.tar.gz TARBALL_CLEAN=clamav-<version>-norar.tar.xz
-Source0:	%name-%version%{?prerelease}-norar.tar.xz
+Source0:	        %{name}-%{version}%{?prerelease}-norar.tar.xz
 %endif
 # To download the *.cvd, go to http://www.clamav.net and use the links
 # there (I renamed the files to add the -version suffix for verifying).
-Source10:	http://db.local.clamav.net/main-55.cvd
-Source11:	http://db.local.clamav.net/daily-19120.cvd
+Source10:	        http://db.local.clamav.net/main-55.cvd
+Source11:	        http://db.local.clamav.net/daily-19120.cvd
 
-Patch24:	clamav-0.92-private.patch
-Patch26:	clamav-0.98-cliopts.patch
-Patch27:	clamav-0.98-umask.patch
+Patch24:	        clamav-0.92-private.patch
+Patch26:	        clamav-0.98-cliopts.patch
+Patch27:	        clamav-0.98-umask.patch
 # https://bugzilla.redhat.com/attachment.cgi?id=403775&action=diff&context=patch&collapsed=&headers=1&format=raw
-Patch29:	clamav-0.98.3-jitoff.patch
+Patch29:	        clamav-0.98.3-jitoff.patch
 # https://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/JIT/Intercept.cpp?r1=128086&r2=137567
-Patch30:	llvm-glibc.patch
-BuildRoot:	%_tmppath/%name-%version-%release-root
-Requires:	clamav-lib = %version-%release
-Requires:	data(clamav)
-BuildRequires:	zlib-devel bzip2-devel gmp-devel curl-devel
-BuildRequires:	ncurses-devel openssl-devel libxml2-devel
+Patch30:	        llvm-glibc.patch
+BuildRoot:	        %{_tmppath}/%{name}-%{version}-%{release}-root
+Requires:	        clamav-lib = %{version}-%{release}
+Requires:	        data(clamav)
+BuildRequires:      zlib-devel bzip2-devel gmp-devel curl-devel
+BuildRequires:      ncurses-devel openssl-devel libxml2-devel
+BuildRequires:      bc tcl groff graphviz
+BuildRequires:      ocaml
 
 %if 0%{?suse_version}
 BuildRequires:      tcpd-devel
@@ -85,61 +76,56 @@
 BuildRequires:      tcp_wrappers-devel
 %endif
 
-%{?with_bytecode:BuildRequires:	bc tcl groff graphviz}
-%if %{have_ocaml}
-%{?with_bytecode:BuildRequires:	ocaml}
-%endif
-
 %package filesystem
-Summary:	Filesystem structure for clamav
-Group:		Applications/File
-Provides:	user(%username)  = 4
-Provides:	group(%username) = 4
+Summary:	        Filesystem structure for clamav
+Group:		        Applications/File
+Provides:	        user(%username)  = 4
+Provides:	        group(%username) = 4
 # Prevent version mix
-Conflicts:	%name < %version-%release
-Conflicts:	%name > %version-%release
-Requires(pre):  shadow-utils
+Conflicts:	        %{name} < %{version}-%{release}
+Conflicts:	        %{name} > %{version}-%{release}
+Requires(pre):      shadow-utils
 %{?noarch}
 
 %package lib
-Summary:	Dynamic libraries for the Clam Antivirus scanner
-Group:		System Environment/Libraries
-Requires:	data(clamav)
+Summary:	        Dynamic libraries for the Clam Antivirus scanner
+Group:		        System Environment/Libraries
+Requires:	        data(clamav)
 
 %package devel
-Summary:	Header files and libraries for the Clam Antivirus scanner
-Group:		Development/Libraries
-Source100:	clamd-gen
-Requires:	clamav-lib        = %version-%release
-Requires:	clamav-filesystem = %version-%release
+Summary:	        Header files and libraries for the Clam Antivirus scanner
+Group:		        Development/Libraries
+Source100:	        clamd-gen
+Requires:	        clamav-lib        = %{version}-%{release}
+Requires:	        clamav-filesystem = %{version}-%{release}
 
 %package data
-Summary:	Virus signature data for the Clam Antivirus scanner
-Group:		Applications/File
-Requires(pre):		clamav-filesystem = %version-%release
-Requires(postun):	clamav-filesystem = %version-%release
-Provides:		data(clamav) = full
-Conflicts:		data(clamav) < full
-Conflicts:		data(clamav) > full
+Summary:            Virus signature data for the Clam Antivirus scanner
+Group:              Applications/File
+Requires(pre):      clamav-filesystem = %{version}-%{release}
+Requires(postun):   clamav-filesystem = %{version}-%{release}
+Provides:           data(clamav) = full
+Conflicts:          data(clamav) < full
+Conflicts:          data(clamav) > full
 %{?noarch}
 
 %package data-empty
-Summary:	Empty data package for the Clam Antivirus scanner
-Group:		Applications/File
-Provides:	data(clamav) = empty
-Conflicts:	data(clamav) < empty
-Conflicts:	data(clamav) > empty
+Summary:	        Empty data package for the Clam Antivirus scanner
+Group:		        Applications/File
+Provides:	        data(clamav) = empty
+Conflicts:	        data(clamav) < empty
+Conflicts:	        data(clamav) > empty
 %{?noarch}
 
 %package update
-Summary:	Auto-updater for the Clam Antivirus scanner data-files
-Group:		Applications/File
-Source200:	freshclam-sleep