From 50ef1a22b403c4b265e52bace30889e690fdf97b Mon Sep 17 00:00:00 2001
From: Meep-Eep <Meep-Eep@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Fri, 19 Jan 2007 18:46:06 +0000
Subject: [PATCH] (MacOS) Don't package up .svn dirs with 'build.sh uqm
 install'.

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2678 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/ChangeLog               | 2 ++
 sc2/build/unix/build.config | 7 +++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/sc2/ChangeLog b/sc2/ChangeLog
index 73216669b..745db7e9f 100644
--- a/sc2/ChangeLog
+++ b/sc2/ChangeLog
@@ -1,4 +1,6 @@
 Changes towards version 0.7:
+- (MacOS) Don't package up .svn dirs with 'build.sh uqm install' (bug #958),
+  from Nic.
 - No more extra newlines to log_add() calls for libs/network/ code - SvdB
 - DUCK videos now play correctly after a video mode change; bug #734 - Alex
 - Cancel key will now quit out of the Manifest Menu (Bug #838) - Michael
diff --git a/sc2/build/unix/build.config b/sc2/build/unix/build.config
index 8c8cac546..1c08f6e91 100644
--- a/sc2/build/unix/build.config
+++ b/sc2/build/unix/build.config
@@ -459,10 +459,9 @@ uqm_install_osx() {
 	echo "Creating base content package..." >&2
 	cp content/version "$INSTROOT/Resources/content/"
 	(cd content && \
-			find . \( -name CVS -o -name packages \) -prune -o \
-			\! \( -type d -o -name packages -o -name CVS -o \
-			-name \*.ogg \) -print | $SED 's/^..//' | \
-			zip -@ uqm-${VERSION}-prv-content.uqm)
+			find . \( -name CVS -o -name packages -o -name .svn \) -prune \
+			-o \! \( -type d -o -name \*.ogg \) -print | \
+			$SED 's/^..//' | zip -@ uqm-${VERSION}-prv-content.uqm)
 	mv content/uqm-$VERSION-prv-content.uqm "$INSTROOT/Resources/content/packages"
 
 	echo "Creating voice content package..." >&2