[csw-devel] SF.net SVN: gar:[9786] csw/mgar/pkg/cswutils/trunk

[bdwalton at users.sourceforge.net]

Revision: 9786
          http://gar.svn.sourceforge.net/gar/?rev=9786&view=rev
Author:   bdwalton
Date:     2010-04-28 02:45:39 +0000 (Wed, 28 Apr 2010)

Log Message:
-----------
cswutils: depend on forthcoming coreutils; enable tests; add overrides; update for moved python files

Modified Paths:
--------------
    csw/mgar/pkg/cswutils/trunk/Makefile
    csw/mgar/pkg/cswutils/trunk/checksums

Modified: csw/mgar/pkg/cswutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cswutils/trunk/Makefile	2010-04-28 00:06:40 UTC (rev 9785)
+++ csw/mgar/pkg/cswutils/trunk/Makefile	2010-04-28 02:45:39 UTC (rev 9786)
@@ -9,10 +9,10 @@
 endef
 
 SVNROOT = http://opencsw.svn.sourceforge.net/svnroot/opencsw/utilities/
-SVN_REV = 96
+SVN_REV = 104
 
 MASTER_SITES =
-SVN_FILES = submit_to_newpkgs.py compare_pkgs.py opencsw_lib.py
+SVN_FILES = compare_pkgs.py
 DISTFILES = COPYING
 DISTFILES += checkpkg checkpkg.8
 DISTFILES += cpan2pkg
@@ -20,8 +20,9 @@
 DISTFILES += stagepkg stagepkg.8
 DISTFILES += stagepkg stagepkg.8
 DISTFILES += $(foreach F,$(SVN_FILES),$(F)-r$(SVN_REV))
+DISTFILES += opencsw.py submitpkg
 
-RUNTIME_DEP_PKGS = CSWtextutils CSWfakeroot CSWperl
+RUNTIME_DEP_PKGS = CSWcoreutils CSWfakeroot CSWperl
 RUNTIME_DEP_PKGS += CSWpmyaml CSWpmlibwww CSWpmhtmltree
 RUNTIME_DEP_PKGS += CSWpython
 
@@ -36,10 +37,13 @@
 
 ARCHALL = 1
 
-# The package contains 'checkpkg', which checks for bad pathes. Of
-# course the bad pathes are inside the package, because it is checked
-# for them. So disable the test.
-ENABLE_CHECK = 0
+CHECKPKG_OVERRIDES_CSWcswutils += unidentified-dependency|CSWcoreutils
+CHECKPKG_OVERRIDES_CSWcswutils += surplus-dependency|CSWperl
+CHECKPKG_OVERRIDES_CSWcswutils += surplus-dependency|CSWcoreutils
+CHECKPKG_OVERRIDES_CSWcswutils += surplus-dependency|CSWpmhtmltree
+CHECKPKG_OVERRIDES_CSWcswutils += surplus-dependency|CSWfakeroot
+CHECKPKG_OVERRIDES_CSWcswutils += surplus-dependency|CSWpmyaml
+CHECKPKG_OVERRIDES_CSWcswutils += surplus-dependency|CSWpmlibwww
 
 include gar/category.mk
 
@@ -49,6 +53,14 @@
 	mv $(subst -r$(SVN_REV),,$(notdir $@)) $@
 	@$(MAKECOOKIE)
 
+$(DOWNLOADDIR)/opencsw.py:
+	ln -s $(abspath gar/lib/python/opencsw.py) $(DOWNLOADDIR)/
+	@$(MAKECOOKIE)
+
+$(DOWNLOADDIR)/submitpkg:
+	ln -s $(abspath gar/bin/submitpkg) $(DOWNLOADDIR)/
+	@$(MAKECOOKIE)
+
 install-custom:
 	@ginstall -d $(DESTDIR)$(bindir)
 	@ginstall $(WORKSRC)/checkpkg $(DESTDIR)$(bindir)
@@ -61,12 +73,12 @@
 	@ginstall $(WORKSRC)/createpkg.8 $(DESTDIR)$(mandir)/man8/
 	@ginstall $(WORKSRC)/stagepkg.8 $(DESTDIR)$(mandir)/man8/
 	@ginstall -d $(DESTDIR)$(libdir)/python/csw
-	@ginstall -m 644 $(WORKSRC)/opencsw_lib.py-r$(SVN_REV) \
-		$(DESTDIR)$(libdir)/python/csw/opencsw_lib.py
-	@for f in compare_pkgs.py submit_to_newpkgs.py; do \
+	@ginstall -m 644 $(WORKSRC)/opencsw.py \
+		$(DESTDIR)$(libdir)/python/csw/opencsw.py
+	@ginstall -m 644 $(WORKSRC)/submitpkg $(DESTDIR)$(bindir)/submitpkg
+	@for f in $(SVN_FILES); do \
 		ginstall -m 755 $(WORKSRC)/$${f}-r$(SVN_REV) \
 		$(DESTDIR)$(libdir)/python/csw/$${f}; \
 	done
 	@ln -s ../lib/python/csw/compare_pkgs.py $(DESTDIR)$(bindir)/comparepkg
-	@ln -s ../lib/python/csw/submit_to_newpkgs.py $(DESTDIR)$(bindir)/submitpkg
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/cswutils/trunk/checksums
===================================================================
--- csw/mgar/pkg/cswutils/trunk/checksums	2010-04-28 00:06:40 UTC (rev 9785)
+++ csw/mgar/pkg/cswutils/trunk/checksums	2010-04-28 02:45:39 UTC (rev 9786)
@@ -1,11 +1,11 @@
 091b12575ebc0e45cf8c3d8b43d8b638  COPYING
 59c261b5337c61ddda9146a2a97efc3d  checkpkg
 6ec3b6597e04714430987ccc199db3c4  checkpkg.8
-24881eb553044a5b437b7293f4138ba4  compare_pkgs.py-r96
+1fae82cde07f0d2eddb688a089e9de5b  compare_pkgs.py-r104
 9a637f6546cc50974159a987302d91c0  cpan2pkg
 93b6a811d303ce3be0050c5a7b3c8e69  createpkg
 a605598f30195f9ab1b29fc3944d3b31  createpkg.8
-6af12950bab350ecd2a14fe1e347b18b  opencsw_lib.py-r96
+ab6da685ca1ba45003e1a90a831a5883  opencsw.py
 cd4496ee27bf86d5c8bc656c9c5974be  stagepkg
 8908a0a898aa07a7a928b2b8bd8384f0  stagepkg.8
-bb90fa5379bcae922a499333951f5796  submit_to_newpkgs.py-r96
+d83f47f61a12b29ba50a5e83944fe4ff  submitpkg


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