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

[wbonnet at users.sourceforge.net]

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

Log Message:
-----------
java/io upgrade to 2.0.1

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

Modified: csw/mgar/pkg/java/ajcio/trunk/Makefile
===================================================================
--- csw/mgar/pkg/java/ajcio/trunk/Makefile	2011-02-18 18:07:50 UTC (rev 13377)
+++ csw/mgar/pkg/java/ajcio/trunk/Makefile	2011-02-18 18:13:00 UTC (rev 13378)
@@ -1,5 +1,5 @@
 SHORTNAME = io
-VERSION = 1.4
+VERSION = 2.0.1
 
 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
 
+# Defines two packages, lib and doc
+PACKAGES = CSWajcio CSWajciodoc
+
+# Package architecture is ALL (pure java)
+ARCHALL = 1
+
+CATALOGNAME_CSWajcio = commons_io
+CATALOGNAME_CSWajciodoc = commons_io_doc
+
+LICENSE = LICENSE.txt
+
+CHECKPKG_OVERRIDES_CSWajcio += catalogname-does-not-match-pkgname|pkgname=CSWajcio|catalogname=commons_io|expected-catalogname=ajcio
+CHECKPKG_OVERRIDES_CSWajciodoc += catalogname-does-not-match-pkgname|pkgname=CSWajciodoc|catalogname=commons_io_doc|expected-catalogname=ajciodoc
+
 # Set archive filename
 DISTFILES = $(NAME)-$(VERSION)-bin.tar.gz
 
-# Defines two packages, lib and doc
-DISTFILES += $(call admfiles,CSWajcio,)
-DISTFILES += $(call admfiles,CSWajciodoc,)
-
 # Defines package description
 SPKG_DESC_CSWajcio    = $(DESCRIPTION)
 SPKG_DESC_CSWajciodoc = $(DESCRIPTION) documentation package
@@ -28,7 +37,6 @@
 # RUNTIME_DEP_PKGS_CSWajcio = No dependency
 
 # Defines package content
-PKGFILES_CSWajcio  = $(prefix)/share/doc/$(NAME)/License.txt
 PKGFILES_CSWajcio += $(prefix)/share/java/.*
 
 # Defines custom steps since java libs do not use autotools
@@ -45,10 +53,9 @@
 	@ginstall -d $(DESTDIR)$(datadir)/java
 	@gcp -fp $(WORKSRC)/$(DISTNAME)/$(NAME)-$(VERSION).jar $(DESTDIR)$(datadir)/java
 	@( cd $(DESTDIR)$(datadir)/java ; \
-	   ln -s $(NAME)-$(VERSION).jar $(NAME)-1.jar ; \
+	   ln -s $(NAME)-$(VERSION).jar $(NAME)-2.0.jar ; \
+	   ln -s $(NAME)-$(VERSION).jar $(NAME)-2.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)/docs/* $(DESTDIR)$(datadir)/doc/$(NAME)
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/java/ajcio/trunk/checksums
===================================================================
--- csw/mgar/pkg/java/ajcio/trunk/checksums	2011-02-18 18:07:50 UTC (rev 13377)
+++ csw/mgar/pkg/java/ajcio/trunk/checksums	2011-02-18 18:13:00 UTC (rev 13378)
@@ -1,3 +1 @@
-2cef2d863797d4f06ea447199da56648  download/commons-io-1.4-bin.tar.gz
-5d5b95a8cde69870e2f598c69eb3ec0a  download/CSWajcio.gspec
-2448b5c0a4ba74bd43ab5875ca47572a  download/CSWajciodoc.gspec
+4f2c26f9d80f89d15939619cc8524f78  commons-io-2.0.1-bin.tar.gz


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