[csw-devel] SF.net SVN: gar:[15616] csw/mgar/pkg/subversion/trunk/Makefile

[rthurner at users.sourceforge.net]

Revision: 15616
          http://gar.svn.sourceforge.net/gar/?rev=15616&view=rev
Author:   rthurner
Date:     2011-09-11 11:41:06 +0000 (Sun, 11 Sep 2011)
Log Message:
-----------
subversion-1.7: adjust checkpkg

Modified Paths:
--------------
    csw/mgar/pkg/subversion/trunk/Makefile

Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile	2011-09-11 11:30:59 UTC (rev 15615)
+++ csw/mgar/pkg/subversion/trunk/Makefile	2011-09-11 11:41:06 UTC (rev 15616)
@@ -50,7 +50,6 @@
 CHECKPKG_OVERRIDES_CSWsvn += license-missing|/opt/csw/share/doc/subversion/license
 RUNTIME_DEP_PKGS_CSWsvn      = CSWbdb48
 RUNTIME_DEP_PKGS_CSWsvn      += CSWsasl
-RUNTIME_DEP_PKGS_CSWsvn      += CSWzlib
 RUNTIME_DEP_PKGS_CSWsvn += CSWlibmagic1
 RUNTIME_DEP_PKGS_CSWsvn += CSWlibsqlite3-0
 RUNTIME_DEP_PKGS_CSWsvn += CSWlibexpat1
@@ -99,7 +98,6 @@
 CATALOGNAME_CSWap2svn         = ap2_subversion
 PKGFILES_CSWap2svn            = $(prefix)/apache2.*
 PKGFILES_CSWap2svn           += $(docdir)/$(CATALOGNAME_CSWap2svn)/changelog.CSW
-CHECKPKG_OVERRIDES_CSWap2svn += license-missing|/opt/csw/share/doc/ap2_subversion/license
 RUNTIME_DEP_PKGS_CSWap2svn    = CSWsvn
 RUNTIME_DEP_PKGS_CSWap2svn   += CSWapache2
 RUNTIME_DEP_PKGS_CSWap2svn += CSWlibmagic1
@@ -111,20 +109,28 @@
 RUNTIME_DEP_PKGS_CSWap2svn += CSWbdb48
 RUNTIME_DEP_PKGS_CSWap2svn += CSWlibapr1-0
 RUNTIME_DEP_PKGS_CSWap2svn += CSWlibaprutil1-0
+CHECKPKG_OVERRIDES_CSWap2svn += license-missing|/opt/csw/share/doc/ap2_subversion/license
+CHECKPKG_OVERRIDES_CSWap2svn += catalogname-does-not-match-pkgname|pkgname=CSWap2svn|catalogname=ap2_subversion|expected-catalogname=ap2svn
 
+
 PACKAGES += CSWjavasvn
 SPKG_DESC_CSWjavasvn           = Subversion Java Language Binding
 CATALOGNAME_CSWjavasvn         = javasvn
 PKGFILES_CSWjavasvn            = $(SVNLIB)/.*java.*
 PKGFILES_CSWjavasvn           += $(docdir)/$(CATALOGNAME_CSWjavasvn)/changelog.CSW 
-RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWjavasvn += CSWbdb48
 RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibapr1-0
+RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibaprutil1-0
+RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibexpat1
 RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibexpat1
-RUNTIME_DEP_PKGS_CSWjavasvn += CSWsasl
-RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibaprutil1-0
+RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibmagic1
 RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibneon27
+RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibsqlite3-0
+RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibz1
 RUNTIME_DEP_PKGS_CSWjavasvn += CSWosslrt
+RUNTIME_DEP_PKGS_CSWjavasvn += CSWsasl
+RUNTIME_DEP_PKGS_CSWjavasvn += CSWsvn
 CHECKPKG_OVERRIDES_CSWjavasvn += license-missing|/opt/csw/share/doc/javasvn/license
 CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
 CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
@@ -183,8 +189,11 @@
 PKGFILES_CSWpythonsvn            = $(libdir)/python.*
 PKGFILES_CSWpythonsvn           += $(SVNLIB)/.*swig_py.*
 PKGFILES_CSWpythonsvn           += $(docdir)/$(CATALOGNAME_CSWpythonsvn)/changelog.CSW
+CHECKPKG_OVERRIDES_CSWpythonsvn += action-class-only-in-pkginfo|none
+CHECKPKG_OVERRIDES_CSWpythonsvn += license-missing|/opt/csw/share/doc/pythonsvn/license
 
 
+
 DISTFILES += CSWsvn.checkinstall
 DISTFILES += CSWap2svn.postinstall CSWap2svn.preremove
 DISTFILES += httpd-svn.conf.CSW svn_access.conf.CSW

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