thomas: server/clamav Makefile,NONE,1.1 kolab.patch,NONE,1.1

cvs at kolab.org cvs at kolab.org
Wed Feb 14 18:44:19 CET 2007


Author: thomas

Update of /kolabrepository/server/clamav
In directory doto:/tmp/cvs-serv382/clamav

Added Files:
	Makefile kolab.patch 
Log Message:
Added clamav 0.90 with new config templates, release-notes and obmtool.conf


--- NEW FILE: Makefile ---
ifeq "x$(KOLABPKGURI)" "x"
  KOLABPKGURI = ftp://ftp.openpkg.org/current/SRC/EVAL/
endif
ifeq "x$(KOLABRPMSRC)" "x"
  KOLABRPMSRC = /kolab/RPM/SRC
endif
ifeq "x$(KOLABRPMPKG)" "x"
  KOLABRPMPKG = /kolab/RPM/PKG
endif
ifeq "x$(KOLABCVSDIR)" "x"
  KOLABCVSDIR = $(CURDIR)
endif

PACKAGE=clamav
VERSION=0.90
RELEASE=20070214
KOLABRELEASE=20070214_kolab

RPM=/kolab/bin/openpkg rpm
KOLABPKGURI:=`/kolab/bin/openpkg register -R $(KOLABPKGURI)`

all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm

$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm kolab.patch
	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm

	cp $(KOLABCVSDIR)/kolab.patch $(KOLABRPMSRC)/$(PACKAGE)/
	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec 
	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(KOLABCVSDIR)

$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm:
	wget -c $(KOLABPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm

dist: all
	cp -p $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/

clean:
	rm -rf /kolab/RPM/TMP/$(PACKAGE)-$(VERSION)

--- NEW FILE: kolab.patch ---
--- clamav.spec.orig	2007-02-14 06:54:23.000000000 +0100
+++ clamav.spec	2007-02-14 17:54:29.000000000 +0100
@@ -33,7 +33,7 @@
 Group:        AntiVirus
 License:      GPL
 Version:      0.90
-Release:      20070214
+Release:      20070214_kolab
 
 #   package options
 %option       with_milter  no
@@ -46,8 +46,8 @@
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20060823, gcc, bzip2
-PreReq:       OpenPKG, openpkg >= 20060823
+BuildPreReq:  OpenPKG, openpkg >= 2.4.3, gcc, bzip2
+PreReq:       OpenPKG, openpkg >= 2.4.3
 BuildPreReq:  zlib, curl, gmp
 PreReq:       zlib, curl, gmp
 %if "%{with_milter}" == "yes"
@@ -84,6 +84,7 @@
     CFLAGS="%{l_cflags -O}" \
     CPPFLAGS="%{l_cppflags}" \
     LDFLAGS="%{l_ldflags}" \
+    LIBS="-lintl -liconv" \
     GREP="grep" \
     ./configure \
         --prefix=%{l_prefix} \
@@ -121,10 +122,10 @@
     %{l_shtool} install -c -m 644 \
         -e 's;^\(Example\);#\1;' \
         -e 's;^#\(LogFile\) /.*;\1 %{l_prefix}/var/clamav/clamd.log;' \
-        -e 's;^#\(LogTime\).*;\1;' \
+        -e 's;^#\(LogTime.*\);\1;' \
         -e 's;^#\(PidFile\).*;\1 %{l_prefix}/var/clamav/clamd.pid;' \
         -e 's;^\(LocalSocket\).*;\1 %{l_prefix}/var/clamav/clamd.sock;' \
-        -e 's;^#\(FixStaleSocket\).*;\1;' \
+        -e 's;^#\(FixStaleSocket.*\);\1;' \
         -e 's;^#\(DatabaseDirectory\).*;\1 %{l_prefix}/share/clamav;' \
         -e 's;^#\(User\).*;\1 %{l_rusr};' \
         etc/clamd.conf \





More information about the commits mailing list