- -major.patch idea applied upstream

diff --git a/clamav-major.patch b/clamav-major.patch
deleted file mode 100644 (file)
index e5fab9c..0000000
--- a/clamav-major.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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 92e40ff536249a21c8fff3634e841ca5b259380c..3b192ebe783215152a8fb659a72d68f546b9cb07 100644 (file)
--- a/clamav.spec
+++ b/clamav.spec
@@ -43,10 +43,9 @@ Patch2:              am-nosilentrules.patch
 %endif
 Patch3:                ac2.68.patch
 Patch4:                %{name}-openssl.patch
-Patch5:                %{name}-major.patch
-Patch6:                x32.patch
-Patch7:                %{name}-add-support-for-system-tomsfastmath.patch
-Patch8:                %{name}-headers.patch
+Patch5:                x32.patch
+Patch6:                %{name}-add-support-for-system-tomsfastmath.patch
+Patch7:                %{name}-headers.patch
 URL:           http://www.clamav.net/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake >= 1:1.11
@@ -218,10 +217,9 @@ Biblioteki statyczne clamav.
 %patch3 -p1
 %endif
 #%patch4 -p1
-#%patch5 -p1
+%patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
 
 %build
 export CFLAGS="%{rpmcflags} -Wall -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99"