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

[wbonnet at users.sourceforge.net]

Revision: 13387
          http://gar.svn.sourceforge.net/gar/?rev=13387&view=rev
Author:   wbonnet
Date:     2011-02-19 10:35:00 +0000 (Sat, 19 Feb 2011)

Log Message:
-----------
java/upload upgrade to 1.2.2

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

Modified: csw/mgar/pkg/java/ajcupload/trunk/Makefile
===================================================================
--- csw/mgar/pkg/java/ajcupload/trunk/Makefile	2011-02-19 02:50:06 UTC (rev 13386)
+++ csw/mgar/pkg/java/ajcupload/trunk/Makefile	2011-02-19 10:35:00 UTC (rev 13387)
@@ -1,5 +1,5 @@
 SHORTNAME = fileupload
-VERSION = 1.2.1
+VERSION = 1.2.2
 
 NAME = commons-$(SHORTNAME)
 CATEGORIES = java
@@ -11,25 +11,33 @@
 
 # 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,CSWajcupload,)
-DISTFILES += $(call admfiles,CSWajcuploaddoc,)
+PACKAGES = CSWajcpeupload CSWajcuploaddoc
 
+# Package architecture is ALL (pure java)
+ARCHALL = 1
+
+CATALOGNAME_CSWajcpeupload = commons_upload
+CATALOGNAME_CSWajcuploaddoc = commons_upload_doc
+
+LICENSE = LICENSE.txt
+
+CHECKPKG_OVERRIDES_CSWajcpeupload += catalogname-does-not-match-pkgname|pkgname=CSWajcpeupload|catalogname=commons_upload|expected-catalogname=ajcpeupload
+CHECKPKG_OVERRIDES_CSWajcuploaddoc += catalogname-does-not-match-pkgname|pkgname=CSWajcuploaddoc|catalogname=commons_upload_doc|expected-catalogname=ajcuploaddoc
+
 # Defines package description
-SPKG_DESC_CSWajcupload    = $(DESCRIPTION)
+SPKG_DESC_CSWajcpeupload    = $(DESCRIPTION)
 SPKG_DESC_CSWajcuploaddoc = $(DESCRIPTION) documentation package
 
 # Defines dependencies
-RUNTIME_DEP_PKGS_CSWajcupload = CSWajclogging CSWajcdigester
+RUNTIME_DEP_PKGS_CSWajcpeupload = CSWajclogging CSWajcdigester
 
 # Defines package content
-PKGFILES_CSWajcupload  = $(prefix)/share/doc/$(NAME)/License.txt
-PKGFILES_CSWajcupload += $(prefix)/share/java/.*
+PKGFILES_CSWajcpeupload += $(prefix)/share/java/.*
 
 # Defines custom steps since java libs do not use autotools
 WORKSRC = $(WORKDIR)
@@ -49,7 +57,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)/site/* $(DESTDIR)$(datadir)/doc/$(NAME)
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/java/ajcupload/trunk/checksums
===================================================================
--- csw/mgar/pkg/java/ajcupload/trunk/checksums	2011-02-19 02:50:06 UTC (rev 13386)
+++ csw/mgar/pkg/java/ajcupload/trunk/checksums	2011-02-19 10:35:00 UTC (rev 13387)
@@ -1,3 +1 @@
-d8cccd7b9938c17169751ed978265673  download/commons-fileupload-1.2.1-bin.tar.gz
-f07adfd3f198606e0ac4a312a8bdeab6  download/CSWajcupload.gspec
-f3376106fd0d1ec93bded90deadf84d2  download/CSWajcuploaddoc.gspec
+fa280caadb0a31b1658167a26f73b2d6  commons-fileupload-1.2.2-bin.tar.gz


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