- new patch

[packages/clamav.git] / clamav.spec

diff --git a/clamav.spec b/clamav.spec
index 195eb9652ec8549b06cb012e65b566142423f112..768df5310e54f6bf48f8399883a36e7932de2a5e 100644 (file)
--- a/clamav.spec
+++ b/clamav.spec
@@ -2,11 +2,11 @@ Summary:      Antivirus for Unix
 Summary(pl):   Antywirus dla Unixów
 Name:          clamav
 Version:       0.11
-Release:       2
+Release:       3
 License:       GPL
 Group:         System/Tools
-######         /home/mick3y/rpm/SOURCES/rpm.groups: no such file
 Source0:       http://www.konarski.edu.pl/~zolw/clam/%{name}-%{version}.tar.gz
+Patch0:                %{name}-db_path.patch
 URL:           http://www.konarski.edu.pl/~zolw/clam.html
 BuildRequires: autoconf
 BuildRequires: automake
@@ -29,28 +29,33 @@ POSIXem.
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 %configure2_13 \
+       --prefix=/usr \
        --disable-clamav \
-       --with-datadir=%{_datadir}/clam
+       --datadir=/usr/share/clam
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_prefix},%{_bindir},%{_mandir},%{_datadir}/clam}
 
-%{__make} prefix=$RPM_BUILD_ROOT%{_prefix} bindir=$RPM_BUILD_ROOT%{_bindir} mandir=$RPM_BUILD_ROOT%{_mandir} datadir=$RPM_BUILD_ROOT%{_datadir}/clam install
+%{__make} prefix=$RPM_BUILD_ROOT%{_prefix} bindir=$RPM_BUILD_ROOT%{_bindir} mandir=$RPM_BUILD_ROOT%{_mandir} datadir=$RPM_BUILD_ROOT/usr/share/clam install
 gzip -9nf AUTHORS FAQ TODO
 
 %clean
 rm -fr $RPM_BUILD_ROOT
 
 %pre
-if [ -z "`id -u clanav 2>/dev/null`" ]; then
- /usr/sbin/useradd -u 95 -r -d /usr/share/clam -s /bin/false -c "ClamAV" -g nobody clamav 1>&2
+if [ -z "`id -u clamav 2>/dev/null`" ]; then
+/usr/sbin/groupadd -g 200 clamav 
+/usr/sbin/useradd -M -g clamav -r -d /usr/share/clam -s /bin/false -c "ClamAV" clamav 1>&2
 fi
 
-%post
+%postun
  /usr/sbin/userdel clamav
+ /usr/sbin/groupdel clamav
 
 %files
 %defattr(644,root,root,755)