[csw-devel] SF.net SVN: gar:[22079] csw/mgar/pkg/lang-python/pysetuptools/trunk

[wahwah at users.sourceforge.net]

Revision: 22079
          http://gar.svn.sourceforge.net/gar/?rev=22079&view=rev
Author:   wahwah
Date:     2013-10-01 16:06:35 +0000 (Tue, 01 Oct 2013)
Log Message:
-----------
lang-python/pysetuptools/trunk: Work around files with spaces

Modified Paths:
--------------
    csw/mgar/pkg/lang-python/pysetuptools/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/lang-python/pysetuptools/trunk/files/0001-Solaris-package-mge-does-not-handle-spaces.patch

Modified: csw/mgar/pkg/lang-python/pysetuptools/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/pysetuptools/trunk/Makefile	2013-10-01 14:48:59 UTC (rev 22078)
+++ csw/mgar/pkg/lang-python/pysetuptools/trunk/Makefile	2013-10-01 16:06:35 UTC (rev 22079)
@@ -10,10 +10,13 @@
 PYSETUPTOOLS_RELEASE := $(shell echo $(VERSION) | sed -e 's/^[0-9].[0-9]*//')
 
 DESCRIPTION = Distribution Utilities for Python
+
 define BLURB
   Distribution Utilities for Python
 endef
 
+PATCHFILES += 0001-Solaris-package-mge-does-not-handle-spaces.patch
+
 ARCHALL_CSWpy-setuptools = 1
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 DISTFILES += LICENSE
@@ -22,8 +25,17 @@
 TEST_SCRIPTS =
 LICENSE = LICENSE
 
+CHECKPKG_OVERRIDES_CSWpy-setuptools += file-with-bad-content
+
 include gar/category.mk
 
+post-install-modulated:
+	mv "$(DESTDIR)$(SITE_PACKAGES)/setuptools/script template.py" \
+		 "$(DESTDIR)$(SITE_PACKAGES)/setuptools/script_template.py"
+	mv "$(DESTDIR)$(SITE_PACKAGES)/setuptools/script template (dev).py" \
+		 "$(DESTDIR)$(SITE_PACKAGES)/setuptools/script_template_(dev).py"
+	@$(MAKECOOKIE)
+
 post-merge:
 	@(cd $(PKGROOT)/$(SITE_PACKAGES)/setuptools/; \
 		rm -rf tests )

Added: csw/mgar/pkg/lang-python/pysetuptools/trunk/files/0001-Solaris-package-mge-does-not-handle-spaces.patch
===================================================================
--- csw/mgar/pkg/lang-python/pysetuptools/trunk/files/0001-Solaris-package-mge-does-not-handle-spaces.patch	                        (rev 0)
+++ csw/mgar/pkg/lang-python/pysetuptools/trunk/files/0001-Solaris-package-mge-does-not-handle-spaces.patch	2013-10-01 16:06:35 UTC (rev 22079)
@@ -0,0 +1,25 @@
+From 2b9d28c7baad8086bba0afdbb343051a3b55f235 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Tue, 1 Oct 2013 17:57:01 +0200
+Subject: [PATCH] Solaris package mge does not handle spaces
+
+---
+ setuptools/command/easy_install.py |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
+index 6ce19fa..f0ab449 100644
+--- a/setuptools/command/easy_install.py
++++ b/setuptools/command/easy_install.py
+@@ -759,7 +759,7 @@ Please make the appropriate changes for your system and try again.
+             return clean_template
+ 
+         if is_script:
+-            template_name = 'script template.py'
++            template_name = 'script_template.py'
+             if dev_path:
+                 template_name = template_name.replace('.py', ' (dev).py')
+             script_text = (get_script_header(script_text) +
+-- 
+1.7.10.3
+

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