rpms/clamav/FC-3 clamav.spec,1.9,1.10

[Warren Togami (wtogami)]

Author: wtogami

Update of /cvs/extras/rpms/clamav/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26248

Modified Files:
	clamav.spec 
Log Message:
sync with FC4



Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-3/clamav.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- clamav.spec	17 May 2005 06:44:26 -0000	1.9
+++ clamav.spec	19 May 2005 07:46:59 -0000	1.10
@@ -8,27 +8,27 @@
 ##
 
 
-%define username	clamav
-%define homedir		%_var/lib/clamav
-%define freshclamlog	%_var/log/freshclam.log
-%define milterlog	%_var/log/clamd.milter
-%define milteruser	clamilt
-%define milterstatedir	%_var/run/clamav-milter
-%define pkgdatadir	%_datadir/%name
+%global username	clamav
+%global homedir		%_var/lib/clamav
+%global freshclamlog	%_var/log/freshclam.log
+%global milterlog	%_var/log/clamd.milter
+%global milteruser	clamilt
+%global milterstatedir	%_var/run/clamav-milter
+%global pkgdatadir	%_datadir/%name
 
 
-%{!?release_func:%define release_func() %1}
+%{!?release_func:%global release_func() %1%{?dist}}
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
 Version:	0.85.1
-Release:	%release_func 1
-Epoch:		0
+Release:	%release_func 4
+
 License:	GPL
 Group:		Applications/File
 URL:		http://www.clamav.net
 Source0:	http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}.tar.gz
-Source999:	http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}.tar.gz.sig
+#Source999:	http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}.tar.gz.sig
 Source1:	clamd-wrapper
 Source2:	clamd.sysconfig
 Source3:	clamd.logrotate
@@ -40,7 +40,7 @@
 Patch21:	clamav-0.70-path.patch
 Patch22:	clamav-0.80-initoff.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
-Requires:	clamav-lib = %{epoch}:%{version}-%{release}
+Requires:	clamav-lib = %{version}-%{release}
 Requires:	data(clamav)
 BuildRequires:	zlib-devel bzip2-devel gmp-devel tcp_wrappers curl-devel
 BuildRequires:	bc
@@ -51,44 +51,44 @@
 Requires:	data(clamav)
 
 %package devel
-Summary:	Headerfiles and libraries for the Clam Antivirus scanner
+Summary:	Header files and libraries for the Clam Antivirus scanner
 Group:		Development/Libraries
 Source100:	clamd-gen
-Requires:	clamav-lib = %{epoch}:%{version}-%{release}
+Requires:	clamav-lib = %{version}-%{release}
 Requires(pre):	%_libdir/pkgconfig
 
 %package data
-Summary:	The virus-signatures for clamav
+Summary:	Virus signature data for the Clam Antivirus scanner
 Group:		Applications/File
 Provides:	data(clamav)
-Requires(pre):		fedora-usermgmt >= 0:0.7
-Requires(postun):	fedora-usermgmt >= 0:0.7
+Requires(pre):		fedora-usermgmt >= 0.7
+Requires(postun):	fedora-usermgmt >= 0.7
 
 %package update
-Summary:	Auto-updater for clamav data-files
+Summary:	Auto-updater for the Clam Antivirus scanner data-files
 Group:		Applications/File
-Requires:	clamav-data = %epoch:%version-%release
+Requires:	clamav-data = %{version}-%{release}
 Requires(pre):		/etc/cron.d
 Requires(postun):	/etc/cron.d
 Requires(post):		%{__chown} %{__chmod}
 
 %package server
-Summary:	The clamav server
+Summary:	Clam Antivirus scanner server
 Group:		System Environment/Daemons
-Provides:	clamav-daemon = %epoch:%version-%release
-Obsoletes:	clamav-daemon < %epoch:%version-%release
-Conflicts:	clamav-daemon > %epoch:%version-%release
+Provides:	clamav-daemon = %{version}-%{release}
+Obsoletes:	clamav-daemon < %{version}-%{release}
+Conflicts:	clamav-daemon > %{version}-%{release}
 ## For now, use this as a placeholder. Later, generate separate -sysv
 ## and -minit subpackages
 Requires:	init(clamav-server)
 Provides:	init(clamav-server)
 Requires:	data(clamav)
-Requires:	clamav-lib = %{epoch}:%{version}-%{release}
+Requires:	clamav-lib = %{version}-%{release}
 Requires(pre):		%_initrddir
 Requires(postun):	%_initrddir
 
 %package milter
-Summary:	A sendmail-milter for clamav
+Summary:	Sendmail-milter for the Clam Antivirus scanner
 Group:		System Environment/Daemons
 ## For now, use this as a placeholder. Later, generate separate -sysv
 ## and -minit subpackages
@@ -102,8 +102,8 @@
 Requires(preun):	chkconfig
 Requires(preun):	initscripts
 Requires(postun):	initscripts
-Requires(pre):		fedora-usermgmt >= 0:0.7
-Requires(postun):	fedora-usermgmt >= 0:0.7
+Requires(pre):		fedora-usermgmt >= 0.7
+Requires(postun):	fedora-usermgmt >= 0.7
 
 
 %description
@@ -406,9 +406,24 @@
 %endif	# _without_milter
 
 %changelog
-* Tue May 17 2005 Oliver Falk <oliver at linux-kernel.at>					  - 0:0.85.1-1
+* Wed May 18 2005 Warren Togami <wtogami at redhat.com> - 0.85.1-4
+- fix dist tagging the way Enrico wants it
+
+* Tue May 17 2005 Oliver Falk <oliver at linux-kernel.at>					  - 0.85.1-2
+- Rebuild
+
+* Tue May 17 2005 Oliver Falk <oliver at linux-kernel.at>					  - 0.85.1-1
 - Update
 
+* Sat May 14 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.85-0
+- updated to 0.85
+
+* Sun May  1 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.84-0
+- updated to 0.84
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
 * Tue Feb 15 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.83-1
 - updated to 0.83
 
@@ -629,5 +644,5 @@
 * Tue Oct 29 2002 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 0.52-1
 - updated to 0.52
 
-* Tue Sep 17 2002 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 
+* Tue Sep 17 2002 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
 - Initial build.