Author: glen Date: Wed Sep 28 20:53:23 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- ac compatible, preserve timestamps
---- Files affected:
packages/clamav:
clamav.spec (1.298 -> 1.299)
---- Diffs:
================================================================
Index: packages/clamav/clamav.spec
diff -u packages/clamav/clamav.spec:1.298 packages/clamav/clamav.spec:1.299
--- packages/clamav/clamav.spec:1.298 Thu Sep 1 19:05:12 2011
+++ packages/clamav/clamav.spec Wed Sep 28 22:53:17 2011
@@ -5,7 +5,11 @@
#
# Conditional build:
%bcond_without milter # build without milter subpackage
-%bcond_without llvm # build without llvm support (Ac)
+%if "%{pld_release}" == "ac"
+%bcond_with llvm # build without llvm support
+%else
+%bcond_without llvm # build without llvm support
+%endif
Summary: An anti-virus utility for Unix
Summary(pl.UTF-8): Narzędzie antywirusowe dla Uniksów
@@ -36,9 +40,10 @@
%{?with_milter:BuildRequires: libmilter-devel}
BuildRequires: libstdc++-devel
BuildRequires: libtool
-%{?with_llvm:BuildRequires: llvm-devel}
%{?with_milter:BuildRequires: libwrap-devel}
+%{?with_llvm:BuildRequires: llvm-devel}
BuildRequires: ncurses-devel
+BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpmbuild(macros) >= 1.514
BuildRequires: zlib-devel
Requires(post,preun): /sbin/chkconfig
@@ -186,17 +191,17 @@
5 * * * * root %{_sbindir}/clamav-cron-updatedb
EOF
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/clamd
+install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/clamd
%if %{with milter}
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/clamav-milter
-install %{SOURCE9} $RPM_BUILD_ROOT/etc/sysconfig/clamav-milter
+install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/clamav-milter
+cp -p %{SOURCE9} $RPM_BUILD_ROOT/etc/sysconfig/clamav-milter
%endif
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/clamd
-install %{SOURCE4} $RPM_BUILD_ROOT%{_sbindir}/clamav-cron-updatedb
-install etc/*.conf $RPM_BUILD_ROOT%{_sysconfdir}
-install %{SOURCE5} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
+cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/clamd
+install -p %{SOURCE4} $RPM_BUILD_ROOT%{_sbindir}/clamav-cron-updatedb
+cp -p etc/*.conf $RPM_BUILD_ROOT%{_sysconfdir}
+cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
-install %{SOURCE8} $RPM_BUILD_ROOT%{_sbindir}
+install -p %{SOURCE8} $RPM_BUILD_ROOT%{_sbindir}
# NOTE: clamd uses sane rights to it's clamd.pid file
# So better keep it dir
@@ -316,7 +321,7 @@
%files milter
%defattr(644,root,root,755)
%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/clamav-milter
-%config(noreplace) %verify(not md5 mtime size) /etc/clamav-milter.conf
+%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/clamav-milter.conf
%attr(754,root,root) /etc/rc.d/init.d/clamav-milter
#%attr(755,root,root) %{_sysconfdir}/cron.daily/clamav-milter
#%attr(755,root,root) %{_sysconfdir}/log.d/scripts/services/clamav-milter
@@ -351,6 +356,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.299 2011/09/28 20:53:17 glen
+- ac compatible, preserve timestamps
+
Revision 1.298 2011/09/01 17:05:12 arekm
- release 2
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/clamav/clamav.spec?r1=1.298&r2=1.299&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
