- rel 3; properly define major; should fix errors like

LibClamAV Warning: Cannot dlopen libclamunrar_iface: file not found -
unrar support unavailable

diff --git a/clamav-major.patch b/clamav-major.patch
new file mode 100644 (file)
index 0000000..e5fab9c
--- /dev/null
+++ b/clamav-major.patch
@@ -0,0 +1,16 @@
+--- clamav-0.98.3/m4/reorganization/version.m4~        2014-05-06 20:59:19.000000000 +0200
++++ clamav-0.98.3/m4/reorganization/version.m4 2014-05-14 20:33:00.181291208 +0200
+@@ -8,10 +8,11 @@
+ LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE"
+ AC_SUBST([LIBCLAMAV_VERSION])
+ 
+-AC_DEFINE_UNQUOTED([LIBCLAMAV_FULLVER], "$major.$LC_AGE.$LC_REVISION",
++MAJOR_VER=$(( $LC_CURRENT - $LC_AGE ))
++AC_DEFINE_UNQUOTED([LIBCLAMAV_FULLVER], "$MAJOR_VER.$LC_AGE.$LC_REVISION",
+         ["Full library version number"])
+ 
+-AC_DEFINE_UNQUOTED([LIBCLAMAV_MAJORVER], $major, ["Major library version number"])
++AC_DEFINE_UNQUOTED([LIBCLAMAV_MAJORVER], $MAJOR_VER, ["Major library version number"])
+ 
+ AC_DEFINE_UNQUOTED([VERSION],"$VERSION",[Version number of package])
+ AC_DEFINE_UNQUOTED([VERSION_SUFFIX],"$VERSION_SUFFIX",[Version suffix for package])

diff --git a/clamav.spec b/clamav.spec
index 32ac1fb6ed46e1150b175f812a726b4efcf739d4..ec23f0d4e41fc5d21e9c3905ad57acb970424fc8 100644 (file)
--- a/clamav.spec
+++ b/clamav.spec
@@ -14,7 +14,7 @@ Summary:      An anti-virus utility for Unix
 Summary(pl.UTF-8):     Narzędzie antywirusowe dla Uniksów
 Name:          clamav
 Version:       0.98.3
-Release:       2
+Release:       3
 License:       GPL v2+
 Group:         Daemons
 Source0:       http://downloads.sourceforge.net/clamav/%{name}-%{version}.tar.gz
@@ -35,6 +35,7 @@ Patch2:               am-nosilentrules.patch
 %endif
 Patch3:                ac2.68.patch
 Patch4:                %{name}-openssl.patch
+Patch5:                %{name}-major.patch
 URL:           http://www.clamav.net/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -174,6 +175,7 @@ Biblioteki statyczne clamav.
 %endif
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 %{__libtoolize}