From 7b814aff954ae0d6c5801b4aa090ea265482849c Mon Sep 17 00:00:00 2001
From: Claudio Valerio <claudio@cvcvc-pro.local>
Date: Fri, 2 Dec 2011 08:36:13 +0100
Subject: [PATCH] fixed the build on mac

---
 Sankore_3.1.pro           | 2 +-
 release.macx.sh           | 6 ++++--
 resources/macx/Info.plist | 8 ++++----
 3 files changed, 9 insertions(+), 7 deletions(-)
 mode change 100644 => 100755 release.macx.sh

diff --git a/Sankore_3.1.pro b/Sankore_3.1.pro
index cb2d403f..687a0886 100644
--- a/Sankore_3.1.pro
+++ b/Sankore_3.1.pro
@@ -126,7 +126,7 @@ macx {
        Foundation \
        -lcrypto
 
-   CONFIG(release, debug|release):CONFIG += x86 ppc
+   CONFIG(release, debug|release):CONFIG += x86
 
    # [03-02-2011] We must use the 32bit version for the moment
    # because the Quicktime components used by this application
diff --git a/release.macx.sh b/release.macx.sh
old mode 100644
new mode 100755
index 1a92324a..5f417bfc
--- a/release.macx.sh
+++ b/release.macx.sh
@@ -16,7 +16,7 @@
 
 # Executables
 QMAKE="/usr/local/Trolltech/Qt-4.7.3/bin/qmake"
-MACDEPLOYQT="`pwd`/../Qt-sankore3.1/bin/macdeployqt"
+MACDEPLOYQT=/usr/local/Trolltech/Qt-4.7.3/bin/macdeployqt
 DMGUTIL="`pwd`/../Sankore-ThirdParty/refnum/dmgutil/dmgutil.pl"
 DSYMUTIL=/usr/bin/dsymutil
 STRIP=/usr/bin/strip
@@ -124,7 +124,9 @@ $PLISTBUDDY -c "Set :CFBundleGetInfoString $NAME" "$INFO_PLIST"
 
 # bundle Qt Frameworks into the app bundle
 notify "Bulding frameworks ..."
-$MACDEPLOYQT "$APP"
+cd "`pwd`/build/macx/release/product/"
+$MACDEPLOYQT "`pwd`/Open-Sankore.app"
+cd -
 
 notify "Extracting debug information ..."
 $DSYMUTIL "$APP/Contents/MacOS/Open-Sankore" -o "$DSYM"
diff --git a/resources/macx/Info.plist b/resources/macx/Info.plist
index 4a287ad3..b5121b1e 100644
--- a/resources/macx/Info.plist
+++ b/resources/macx/Info.plist
@@ -49,13 +49,13 @@
 			</dict>
 		</array>
 		<key>CFBundleExecutable</key>
-		<string>Sankore 3.1</string>
+		<string>Open-Sankore</string>
 		<key>CFBundleGetInfoString</key>
-		<string>Sankore 3.1  @SHORT_VERSION@</string>
+		<string>Open-Sankore @SHORT_VERSION@</string>
 		<key>CFBundleIconFile</key>
 		<string>Uniboard.icns</string>
 		<key>CFBundleIdentifier</key>
-		<string>com.mnemis.sankore_3.1</string>
+		<string>com.sankore.open-sankore</string>
 		<key>CFBundlePackageType</key>
 		<string>APPL</string>
 		<key>CFBundleShortVersionString</key>
@@ -72,7 +72,7 @@
 				<key>UTTypeIdentifier</key>
 				<string>com.mnemis.uniboard.document</string>
 				<key>UTTypeDescription</key>
-				<string>Uniboard document</string>
+				<string>Open-Sankore document</string>
 				<key>UTTypeConformsTo</key>
 				<array>
 					<string>public.presentation</string>