rpms/clamav/devel clamav.spec,1.36,1.37

[Enrico Scholz (ensc)]

Author: ensc

Update of /cvs/extras/rpms/clamav/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3795

Modified Files:
	clamav.spec 
Log Message:
- removed a superfluous '}'
- removed some code which was relevant for FC-3 only



Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- clamav.spec	8 Jul 2006 13:17:12 -0000	1.36
+++ clamav.spec	8 Jul 2006 15:57:54 -0000	1.37
@@ -82,7 +82,7 @@
 Group:		System Environment/Daemons
 Provides:	clamav-daemon = %version-%release
 Obsoletes:	clamav-daemon < %version-%release
-Conflicts:	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)
@@ -184,16 +184,8 @@
 ## ------------------------------------------------------------
 
 %build
-## '--disable-zlib-vcheck' is used because every FC<=3 ships zlib-1.2.1*
-## but clamav checks for zlib >= 1.2.2.  This option can be removed for
-## FC4 builds.
-##
-## See https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 and
-## http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0797
-## also
-CFLAGS="$RPM_OPT_FLAGS -Wall -W -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99"
+CFLAGS="$RPM_OPT_FLAGS -Wall -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99"
 %configure --disable-clamav --with-dbdir=/var/lib/clamav \
-           --disable-zlib-vcheck \
 	   --enable-milter
 
 ## HACK: ./configure checks if freshclam.conf/clamd.conf are existing
@@ -425,6 +417,10 @@
 %ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog
 
 %changelog
+* Sat Jul  8 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
+- removed a superfluous '}'
+- removed some code which was relevant for FC-3 only
+
 * Sat Jul  8 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88.3-1
 - updated to 0.88.3
 - updated to new fedora-usermgmt macros