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

[wbonnet at users.sourceforge.net]

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

Log Message:
-----------
java/math updating to 2.1

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

Modified: csw/mgar/pkg/java/ajcmath/trunk/Makefile
===================================================================
--- csw/mgar/pkg/java/ajcmath/trunk/Makefile	2011-02-19 02:03:13 UTC (rev 13381)
+++ csw/mgar/pkg/java/ajcmath/trunk/Makefile	2011-02-19 02:14:30 UTC (rev 13382)
@@ -1,5 +1,5 @@
 SHORTNAME = math
-VERSION = 1.2
+VERSION = 2.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
 
 # Set archive filename
 DISTFILES = $(NAME)-$(VERSION).tar.gz
 
 # Defines two packages, lib and doc
-DISTFILES += $(call admfiles,CSWajcmath,)
-DISTFILES += $(call admfiles,CSWajcmathdoc,)
+PACKAGES = CSWajcmath CSWajcmathdoc
 
+# Package architecture is ALL (pure java)
+ARCHALL = 1
+
+CATALOGNAME_CSWajcmath = commons_math
+CATALOGNAME_CSWajcmathdoc = commons_math_doc
+
+LICENSE = LICENSE.txt
+
+CHECKPKG_OVERRIDES_CSWajcmath += catalogname-does-not-match-pkgname|pkgname=CSWajcmath|catalogname=commons_math|expected-catalogname=ajcmath
+CHECKPKG_OVERRIDES_CSWajcmathdoc += catalogname-does-not-match-pkgname|pkgname=CSWajcmathdoc|catalogname=commons_math_doc|expected-catalogname=ajcmathdoc
+
 # Defines package description
 SPKG_DESC_CSWajcmath    = $(DESCRIPTION)
 SPKG_DESC_CSWajcmathdoc = $(DESCRIPTION) documentation package
@@ -28,7 +37,6 @@
 RUNTIME_DEP_PKGS_CSWajcmath = CSWajcdiscovery
 
 # Defines package content
-PKGFILES_CSWajcmath  = $(prefix)/share/doc/$(NAME)/License.txt
 PKGFILES_CSWajcmath += $(prefix)/share/java/.*
 
 # Defines custom steps since java libs do not use autotools
@@ -45,10 +53,8 @@
 	@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.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/ajcmath/trunk/checksums
===================================================================
--- csw/mgar/pkg/java/ajcmath/trunk/checksums	2011-02-19 02:03:13 UTC (rev 13381)
+++ csw/mgar/pkg/java/ajcmath/trunk/checksums	2011-02-19 02:14:30 UTC (rev 13382)
@@ -1,3 +1 @@
-6296081b9b9c0f3f7469565a96454a35  download/commons-math-1.2.tar.gz
-7299a462f2b113ab49bf7820db254da5  download/CSWajcmath.gspec
-399e3dab33c386cc7e5799855aea0738  download/CSWajcmathdoc.gspec
+96114338b7e3b36c3e79bce26ff5827a  commons-math-2.1.tar.gz


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