[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kolab-commits
Subject:    thomas: server/amavisd .cvsignore, NONE, 1.1 Makefile, 1.1,
From:       cvs () kolab ! org
Date:       2007-04-26 15:15:38
Message-ID: 20070426151538.E4EE41005B3 () lists ! intevation ! de
[Download RAW message or body]

Author: thomas

Update of /kolabrepository/server/amavisd
In directory doto:/tmp/cvs-serv19460

Modified Files:
	Makefile kolab.patch 
Added Files:
	.cvsignore 
Removed Files:
	amavisd.MYUSERS.patch 
Log Message:
Create amavisd package containing the patch from kolab/issue1447
(Virus Scanning: Inserted note when partially scanned ugly.)

This was tested outside the packaged versions but forgotten to be included.


--- NEW FILE: .cvsignore ---
*.src.rpm

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/amavisd/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	6 Jan 2005 13:28:22 -0000	1.1
+++ Makefile	26 Apr 2007 15:15:36 -0000	1.2
@@ -1,27 +1,38 @@
 ifeq "x$(KOLABPKGURI)" "x"
-  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.2/SRC/PLUS
+  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.5/SRC/PLUS/
 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=amavisd
-VERSION=2.1.2
-RELEASE=2.2.0
+VERSION=2.3.3
+RELEASE=2.5.0
+KOLABRELEASE=2.5.0_kolab
 
 RPM=/kolab/bin/openpkg rpm
- 
-all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
-	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+KOLABPKGURI:=`/kolab/bin/openpkg register -R $(KOLABPKGURI)`
 
-	cp $(KOLABCVSDIR)/amavisd.MYUSERS.patch $(KOLABRPMSRC)/$(PACKAGE)/
-	cp $(KOLABCVSDIR)/kolab.patch $(KOLABRPMSRC)/$(PACKAGE)/           # Patch for \
.spec +all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
 
+$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: \
$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm undecipherable_subject.patch kolab.patch \
+	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm +
+	cp $(KOLABCVSDIR)/undecipherable_subject.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)

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/amavisd/kolab.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolab.patch	6 Jan 2005 13:28:22 -0000	1.1
+++ kolab.patch	26 Apr 2007 15:15:36 -0000	1.2
@@ -1,27 +1,28 @@
---- amavisd.spec.orig	2005-01-06 00:28:37.000000000 +0100
-+++ amavisd.spec	2005-01-06 00:42:17.000000000 +0100
-@@ -34,7 +34,7 @@ Class:        PLUS
+diff -urN amavisd.orig/amavisd.spec amavisd/amavisd.spec
+--- amavisd.orig/amavisd.spec	2005-10-11 14:46:17.000000000 +0200
++++ amavisd/amavisd.spec	2007-04-26 17:03:02.666179000 +0200
+@@ -36,7 +36,7 @@
  Group:        Mail
  License:      GPL
- Version:      2.1.2
--Release:      2.2.0
-+Release:      2.2.0_kolab
+ Version:      %{V_amavis}
+-Release:      2.5.0
++Release:      2.5.0_kolab
  
  #   package options
  %option       with_milter no
-@@ -43,6 +43,7 @@ Release:      2.2.0
- Source0:      http://www.ijs.si/software/amavisd/amavisd-new-%{version}.tar.gz
- Source1:      http://homepages.hs-bremen.de/~renegat/amavislogsumm
+@@ -46,6 +46,7 @@
+ Source1:      ftp://ftp.openpkg.org/sources/CPY/VERSIONED/amavisd/amavislogsumm-%{V_logsumm}
  Source2:      rc.amavisd
-+Patch0:       amavisd.MYUSERS.patch
+ Patch0:       amavisd.patch
++Patch1:       undecipherable_subject.patch
  
  #   build information
  Prefix:       %{l_prefix}
-@@ -75,6 +76,7 @@ AutoReqProv:  no
- 
+@@ -84,6 +85,7 @@
  %prep
      %setup -q -n amavisd-new-%{version}
-+    %patch -p0 -P 0
+     %patch -p0
++    %patch -p0 -P 1
+ 
+ %build
      %{l_shtool} subst \
-         -e "s;'clamscan';'%{l_prefix}/bin/clamscan';g" \
-         -e "s;'uvscan';'%{l_prefix}/bin/uvscan';g" \

--- amavisd.MYUSERS.patch DELETED ---


_______________________________________________
Kolab-commits mailing list
Kolab-commits@kolab.org
https://kolab.org/mailman/listinfo/kolab-commits


[prev in list] [next in list] [prev in thread] [next in thread]