[csw-devel] SF.net SVN: gar:[7332] csw/mgar/gar/v2

[dmichelsen at users.sourceforge.net]

Revision: 7332
          http://gar.svn.sourceforge.net/gar/?rev=7332&view=rev
Author:   dmichelsen
Date:     2009-11-17 21:56:31 +0000 (Tue, 17 Nov 2009)

Log Message:
-----------
mGAR v2: Fix cpan category for automatic CSWcommon dependency inside GAR

Modified Paths:
--------------
    csw/mgar/gar/v2/categories/cpan/category.mk
    csw/mgar/gar/v2/pkglib/csw/depend.perl
    csw/mgar/gar/v2/pkglib/csw_cpan.gspec

Added Paths:
-----------
    csw/mgar/gar/v2/pkglib/csw_cpan_dyngspec.gspec

Modified: csw/mgar/gar/v2/categories/cpan/category.mk
===================================================================
--- csw/mgar/gar/v2/categories/cpan/category.mk	2009-11-17 20:29:17 UTC (rev 7331)
+++ csw/mgar/gar/v2/categories/cpan/category.mk	2009-11-17 21:56:31 UTC (rev 7332)
@@ -34,7 +34,7 @@
 SPKG_SOURCEURL := $(SPKG_SOURCEURL)/$(GARNAME)
 
 _MERGE_EXCLUDE_CATEGORY = .*/perllocal\.pod .*/\.packlist
-_CATEGORY_GSPEC_INCLUDE ?= csw_cpan.gspec
+_CATEGORY_GSPEC_INCLUDE ?= csw_cpan_dyngspec.gspec
 
 include gar/gar.mk
 

Modified: csw/mgar/gar/v2/pkglib/csw/depend.perl
===================================================================
--- csw/mgar/gar/v2/pkglib/csw/depend.perl	2009-11-17 20:29:17 UTC (rev 7331)
+++ csw/mgar/gar/v2/pkglib/csw/depend.perl	2009-11-17 21:56:31 UTC (rev 7332)
@@ -1,2 +1 @@
-P CSWcommon common - common files and dirs for CSW packages
 P CSWperl perl - A high-level, general-purpose programming language

Modified: csw/mgar/gar/v2/pkglib/csw_cpan.gspec
===================================================================
--- csw/mgar/gar/v2/pkglib/csw_cpan.gspec	2009-11-17 20:29:17 UTC (rev 7331)
+++ csw/mgar/gar/v2/pkglib/csw_cpan.gspec	2009-11-17 21:56:31 UTC (rev 7332)
@@ -1,5 +1,6 @@
 %include        url file://%{PKGLIB}/csw_vars.gspec
 %pkginfo        url file://%{PKGLIB}/csw/pkginfo
 %prototype      exec cswproto -s %{TIMESTAMP} -r %{DESTDIR} %{DESTDIR}
+%depend:merge   url file://%{PKGLIB}/csw/depend
 %depend:merge   url file://%{PKGLIB}/csw/depend.perl
 %depend         exec gawk '$1 ~ /f/{print $3}' %{prototype} | depmaker --root %{DESTDIR} --nodep %{pkgname} %{DEPMAKER_EXTRA_ARGS}

Copied: csw/mgar/gar/v2/pkglib/csw_cpan_dyngspec.gspec (from rev 7323, csw/mgar/gar/v2/pkglib/csw_cpan.gspec)
===================================================================
--- csw/mgar/gar/v2/pkglib/csw_cpan_dyngspec.gspec	                        (rev 0)
+++ csw/mgar/gar/v2/pkglib/csw_cpan_dyngspec.gspec	2009-11-17 21:56:31 UTC (rev 7332)
@@ -0,0 +1,5 @@
+%include        url file://%{PKGLIB}/csw_vars.gspec
+%pkginfo        url file://%{PKGLIB}/csw/pkginfo
+%prototype      exec cswproto -s %{TIMESTAMP} -r %{DESTDIR} %{DESTDIR}
+%depend:merge   url file://%{PKGLIB}/csw/depend.perl
+%depend         exec gawk '$1 ~ /f/{print $3}' %{prototype} | depmaker --root %{DESTDIR} --nodep %{pkgname} %{DEPMAKER_EXTRA_ARGS}


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