Cleanups
This commit is contained in:
parent
d74f556fea
commit
53394fefe4
@ -1,4 +1,4 @@
|
||||
VERSION=0.101.4
|
||||
VERSION=0.101.5
|
||||
NAME=clamav
|
||||
TARBALL_CLEAN=${NAME}-${VERSION}-norar.tar.xz
|
||||
TARBALL=${NAME}-${VERSION}.tar.gz
|
||||
@ -6,6 +6,4 @@ TARBALL=${NAME}-${VERSION}.tar.gz
|
||||
wget https://www.clamav.net/downloads/production/${TARBALL}
|
||||
wget https://www.clamav.net/downloads/production/${TARBALL}.sig
|
||||
gpg --verify ${TARBALL}.sig ${TARBALL}
|
||||
#rm -f ${TARBALL}.tmp
|
||||
zcat ${TARBALL} | tar --delete -f - '*/libclamunrar/*' | xz -c > ${TARBALL_CLEAN}
|
||||
#mv ${TARBALL}.tmp ${TARBALL_CLEAN}
|
||||
|
14
clamav.spec
14
clamav.spec
@ -204,7 +204,6 @@ Obsoletes: clamav-milter-systemd < %{version}-%{release}
|
||||
%description milter
|
||||
This package contains files which are needed to run the clamav-milter.
|
||||
|
||||
## ------------------------------------------------------------
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}%{?prerelease}
|
||||
@ -220,8 +219,6 @@ mkdir -p libclamunrar{,_iface}
|
||||
%{!?with_unrar:touch libclamunrar/{Makefile.in,all,install}}
|
||||
|
||||
|
||||
## ------------------------------------------------------------
|
||||
|
||||
%build
|
||||
# add -Wl,--as-needed if not exist
|
||||
echo %{?__global_ldflags} | sed '/-Wl,--as-needed/!s/$/ -Wl,--as-needed/'
|
||||
@ -257,8 +254,6 @@ sed -i \
|
||||
%make_build
|
||||
|
||||
|
||||
## ------------------------------------------------------------
|
||||
|
||||
%install
|
||||
rm -rf _doc*
|
||||
%make_install
|
||||
@ -343,12 +338,10 @@ EOF
|
||||
# TODO: Evaluate using upstream's unit with clamav-daemon.socket
|
||||
rm $RPM_BUILD_ROOT%_unitdir/clamav-daemon.*
|
||||
|
||||
## ------------------------------------------------------------
|
||||
|
||||
%check
|
||||
make check
|
||||
|
||||
## ------------------------------------------------------------
|
||||
|
||||
%pre filesystem
|
||||
getent group %{updateuser} >/dev/null || groupadd -r %{updateuser}
|
||||
@ -437,7 +430,6 @@ test -e %milterlog || {
|
||||
%exclude %_mandir/*/freshclam*
|
||||
%exclude %_mandir/man5/clamd.conf.5*
|
||||
|
||||
## -----------------------
|
||||
|
||||
%files lib
|
||||
%_libdir/libclamav.so.9*
|
||||
@ -446,7 +438,6 @@ test -e %milterlog || {
|
||||
%_libdir/libclamunrar*.so.9*
|
||||
%endif
|
||||
|
||||
## -----------------------
|
||||
|
||||
%files devel
|
||||
%_includedir/*
|
||||
@ -454,13 +445,11 @@ test -e %milterlog || {
|
||||
%_libdir/pkgconfig/*
|
||||
%_bindir/clamav-config
|
||||
|
||||
## -----------------------
|
||||
|
||||
%files filesystem
|
||||
%attr(-,%updateuser,%updateuser) %dir %homedir
|
||||
%dir %_sysconfdir/clamd.d
|
||||
|
||||
## -----------------------
|
||||
|
||||
%files data
|
||||
%defattr(-,%updateuser,%updateuser,-)
|
||||
@ -479,8 +468,6 @@ test -e %milterlog || {
|
||||
%ghost %attr(0664,%updateuser,%updateuser) %homedir/mirrors.dat
|
||||
|
||||
|
||||
## -----------------------
|
||||
|
||||
%files -n clamd
|
||||
%doc _doc_server/*
|
||||
%_mandir/man5/clamd.conf.5*
|
||||
@ -497,7 +484,6 @@ test -e %milterlog || {
|
||||
%dir %attr(0710,%scanuser,virusgroup) %scanstatedir
|
||||
%endif
|
||||
|
||||
## -----------------------
|
||||
|
||||
%files milter
|
||||
%doc clamav-milter/README.fedora
|
||||
|
Loading…
x
Reference in New Issue
Block a user