[clamav/f13/master] Revert "Merge remote branch 'origin/master' into f13"

[ensc]

commit 53ee317fd2b418cc156ff4e0e18700a625267f95
Author: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date:   Wed Aug 11 09:56:14 2010 +0200

    Revert "Merge remote branch 'origin/master' into f13"
    
    This reverts commit 1fff398bf693f0f435708d2698024aa1700724d1, reversing
    changes made to 6faa0c925672cdcf210bb7f7494f704730b2d77a.

 clamav.spec |   44 +++++++++-----------------------------------
 verinfo     |    2 +-
 2 files changed, 10 insertions(+), 36 deletions(-)
---
diff --git a/clamav.spec b/clamav.spec
index bd79214..900c2f7 100644
--- a/clamav.spec
+++ b/clamav.spec
@@ -1,4 +1,4 @@
-#global prerelease	rc1
+#global snapshot	rc1
 
 ## Fedora Extras specific customization below...
 %bcond_without		fedora
@@ -8,12 +8,6 @@
 %bcond_without		bytecode
 ##
 
-%ifnarch s390 s390x
-%global have_ocaml	1
-%else
-%global have_ocaml	0
-%endif
-
 %global username	clamupdate
 %global homedir		%_var/lib/clamav
 %global freshclamlog	%_var/log/freshclam.log
@@ -26,26 +20,26 @@
 %global scanstatedir	%_var/run/clamd.scan
 
 %{?with_noarch:%global noarch	BuildArch:	noarch}
-%{!?release_func:%global release_func() %%{?prerelease:0.}%1%%{?prerelease:.%%prerelease}%%{?dist}}
+%{!?release_func:%global release_func() %1%{?dist}}
 %{!?apply:%global  apply(p:n:b:) %patch%%{-n:%%{-n*}} %%{-p:-p %%{-p*}} %%{-b:-b %%{-b*}} \
 %nil}
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
 Version:	0.96.1
-Release:	%release_func 1401
+Release:	%release_func 1300
 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%{?snapshot}.tar.gz
+Source999:	http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?snapshot}.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 [TARBALL=<original-tarball>] [VERSION=<version>]
-Source0:	%name-%version%{?prerelease}-norar.tar.xz
+Source0:	%name-%version%{?snapshot}-norar.tar.xz
 %endif
 Source1:	clamd-wrapper
 Source2:	clamd.sysconfig
@@ -67,10 +61,7 @@ Requires:	data(clamav)
 BuildRequires:	zlib-devel bzip2-devel gmp-devel curl-devel
 BuildRequires:	ncurses-devel
 BuildRequires:	%_includedir/tcpd.h
-%{?with_bytecode:BuildRequires:	bc tcl groff graphviz}
-%if %{have_ocaml}
-%{?with_bytecode:BuildRequires:	ocaml}
-%endif
+%{?with_bytecode:BuildRequires:	bc tcl ocaml groff graphviz}
 
 %package filesystem
 Summary:	Filesystem structure for clamav
@@ -320,7 +311,7 @@ The Upstart initscripts for clamav-milter.
 ## ------------------------------------------------------------
 
 %prep
-%setup -q -n %{name}-%{version}%{?prerelease}
+%setup -q -n %{name}-%{version}%{?snapshot}
 
 %apply -n24 -p1 -b .private
 %apply -n25 -p1 -b .open
@@ -714,30 +705,13 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || :
 
 
 %changelog
-* Tue Jul 13 2010 Dan Horák <dan[at]danny.cz> - 0.96.1-1401
-- ocaml not available (at least) on s390(x)
-
 * Tue Jun  1 2010 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.96.1-1400
 - updated to 0.96.1
-- rediffed patches
-
-* Sat May 19 2010 Rakesh Pandit <rakesh at fedoraproject.org> - 0.96.1403
-- CVE-2010-1639 Clam AntiVirus: Heap-based overflow, when processing malicious PDF file(s)
-
-* Wed Apr 21 2010 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.96-1402
-- updated to final 0.96
 - applied upstream patch which allows to disable JIT compiler (#573191)
-- build JIT compiler again
 - disabled JIT compiler by default
 - removed explicit 'pkgconfig' requirements in -devel (#533956)
-
-* Sat Mar 20 2010 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.96-0.1401.rc1
-- do not build the bytecode JIT compiler for now until it can be disabled
-  at runtime (#573191)
-
-* Thu Mar 11 2010 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.96-1400.rc1
-- updated to 0.96rc1
 - added some BRs
+- rediffed patches
 
 * Sun Dec  6 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.95.3-1301
 - updated -upstart to upstart 0.6.3
diff --git a/verinfo b/verinfo
index 460dd77..814d953 100644
--- a/verinfo
+++ b/verinfo
@@ -1,2 +1,2 @@
 http://sourceforge.net/project/showfiles.php?group_id=86638&package_id=90197
-href="/projects/clamav/files/clamav/([0-9.-]*?)"
+clamav-([0-9.-]*?)\.tar\.