[csw-devel] SF.net SVN: gar:[13370] csw/mgar/pkg/java/ajcemail/trunk

[wbonnet at users.sourceforge.net]

Revision: 13370
          http://gar.svn.sourceforge.net/gar/?rev=13370&view=rev
Author:   wbonnet
Date:     2011-02-18 16:24:12 +0000 (Fri, 18 Feb 2011)

Log Message:
-----------
java/email Upgrade to 1.2

Modified Paths:
--------------
    csw/mgar/pkg/java/ajcemail/trunk/Makefile
    csw/mgar/pkg/java/ajcemail/trunk/checksums

Modified: csw/mgar/pkg/java/ajcemail/trunk/Makefile
===================================================================
--- csw/mgar/pkg/java/ajcemail/trunk/Makefile	2011-02-18 16:21:45 UTC (rev 13369)
+++ csw/mgar/pkg/java/ajcemail/trunk/Makefile	2011-02-18 16:24:12 UTC (rev 13370)
@@ -1,5 +1,5 @@
 SHORTNAME = email
-VERSION = 1.1
+VERSION = 1.2
 
 NAME = commons-$(SHORTNAME)
 CATEGORIES = java
@@ -11,15 +11,24 @@
 
 # Use jakarta sources
 MASTER_SITES = http://apache.cict.fr/commons/$(SHORTNAME)/binaries/
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*)(-bin*).tar.gz
 
 # Set archive filename
 DISTFILES = $(NAME)-$(VERSION)-bin.tar.gz
 
 # Defines two packages, lib and doc
-DISTFILES += $(call admfiles,CSWajcemail,)
-DISTFILES += $(call admfiles,CSWajcemaildoc,)
+PACKAGES = CSWajcemail CSWajcemaildoc
 
+# Package architecture is ALL (pure java)
+ARCHALL = 1
+
+CATALOGNAME_CSWajcemail = commons_email
+CATALOGNAME_CSWajcemaildoc = commons_email_doc
+
+LICENSE = LICENSE.txt
+
+CHECKPKG_OVERRIDES_CSWajcemail += catalogname-does-not-match-pkgname|pkgname=CSWajcemail|catalogname=commons_email|expected-catalogname=ajcemail
+CHECKPKG_OVERRIDES_CSWajcemaildoc += catalogname-does-not-match-pkgname|pkgname=CSWajcemaildoc|catalogname=commons_email_doc|expected-catalogname=ajcemaildoc
+
 # Defines package description
 SPKG_DESC_CSWajcemail    = $(DESCRIPTION)
 SPKG_DESC_CSWajcemaildoc = $(DESCRIPTION) documentation package
@@ -28,7 +37,6 @@
 RUNTIME_DEP_PKGS_CSWajcemail = CSWajclogging CSWajccollect CSWajcbeanutils 	
 
 # Defines package content
-PKGFILES_CSWajcemail  = $(prefix)/share/doc/$(NAME)/License.txt
 PKGFILES_CSWajcemail += $(prefix)/share/java/.*
 
 # Defines custom steps since java libs do not use autotools
@@ -48,7 +56,5 @@
 	   ln -s $(NAME)-$(VERSION).jar $(NAME)-1.jar ; \
 	   ln -s $(NAME)-$(VERSION).jar $(NAME).jar )
 	@ginstall -d $(DESTDIR)$(datadir)/doc/$(NAME)
-	@gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(NAME)/License.txt
-	@gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(NAME)/License-documentation.txt
 	@gcp -frp $(WORKSRC)/$(DISTNAME)/apidocs/* $(DESTDIR)$(datadir)/doc/$(NAME)
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/java/ajcemail/trunk/checksums
===================================================================
--- csw/mgar/pkg/java/ajcemail/trunk/checksums	2011-02-18 16:21:45 UTC (rev 13369)
+++ csw/mgar/pkg/java/ajcemail/trunk/checksums	2011-02-18 16:24:12 UTC (rev 13370)
@@ -1,3 +1 @@
-c82d89aab2e58d1c50e44db4c6a6a8f9  download/commons-email-1.1-bin.tar.gz
-c6e394e0d325e28751330370274fe370  download/CSWajcemail.gspec
-1e11b6a6e721335beea0c4a2f5ad5b47  download/CSWajcemaildoc.gspec
+d084fd111b638d13fd36ab988c900a6b  commons-email-1.2-bin.tar.gz


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.