- release 4, install more header files and put them under own dir

diff --git a/clamav-headers.patch b/clamav-headers.patch
new file mode 100644 (file)
index 0000000..8541c0c
--- /dev/null
+++ b/clamav-headers.patch
@@ -0,0 +1,33 @@
+--- clamav-0.101.0/Makefile.am~        2018-11-29 14:52:31.000000000 +0100
++++ clamav-0.101.0/Makefile.am 2018-12-07 09:00:16.238721757 +0100
+@@ -23,6 +23,8 @@
+ 
+ bin_SCRIPTS=clamav-config
+ 
++pkginclude_HEADERS = clamav-config.h platform.h
++
+ if ENABLE_CLAMSUBMIT
+ SUBDIRS += clamsubmit
+ endif
+--- clamav-0.101.0/libclamav/Makefile.am~      2018-11-29 14:52:31.000000000 +0100
++++ clamav-0.101.0/libclamav/Makefile.am       2018-12-07 09:00:16.312058931 +0100
+@@ -269,7 +269,7 @@
+ libclamav_la_LDFLAGS += -Wl,@VERSIONSCRIPTFLAG@,@top_srcdir@/libclamav/libclamav.map
+ endif
+ 
+-include_HEADERS = clamav.h
++pkginclude_HEADERS = clamav.h cltypes.h
+ 
+ libclamav_la_SOURCES = \
+         matcher-ac.c \
+--- clamav-0.101.0/libclamav.pc.in~    2018-11-29 14:52:31.000000000 +0100
++++ clamav-0.101.0/libclamav.pc.in     2018-12-10 11:11:47.748327272 +0100
+@@ -1,7 +1,7 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+-includedir=@includedir@
++includedir=@includedir@/clamav
+ 
+ Name: libclamav
+ Description: A GPL virus scanner

diff --git a/clamav.spec b/clamav.spec
index b2147deb746f310c17d37a67f9aa56748453c38b..8ec51db43adfc5eea3625d5cdae9b307a25cec6b 100644 (file)
--- a/clamav.spec
+++ b/clamav.spec
@@ -19,7 +19,7 @@ Summary:      An anti-virus utility for Unix
 Summary(pl.UTF-8):     Narzędzie antywirusowe dla Uniksów
 Name:          clamav
 Version:       0.101.0
-Release:       3
+Release:       4
 License:       GPL v2+
 Group:         Daemons
 #Source0Download: http://www.clamav.net/download
@@ -46,6 +46,7 @@ Patch4:               %{name}-openssl.patch
 Patch5:                %{name}-major.patch
 Patch6:                x32.patch
 Patch7:                %{name}-add-support-for-system-tomsfastmath.patch
+Patch8:                %{name}-headers.patch
 URL:           http://www.clamav.net/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake >= 1:1.11
@@ -220,6 +221,7 @@ Biblioteki statyczne clamav.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %build
 export CFLAGS="%{rpmcflags} -Wall -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99"
@@ -456,7 +458,11 @@ fi
 %endif
 %{_libdir}/libclamunrar.la
 %{_libdir}/libclamunrar_iface.la
-%{_includedir}/clamav.h
+%dir %{_includedir}/clamav
+%{_includedir}/clamav/clamav.h
+%{_includedir}/clamav/clamav-config.h
+%{_includedir}/clamav/cltypes.h
+%{_includedir}/clamav/platform.h
 %{_pkgconfigdir}/libclamav.pc
 
 %files static