[Packaging] Apply fixes to OSX app scripts

 * Fix path to dist dir
 * Rename dylib with new soversion for lt 1.1.x
 * Create Info.plist with version and year automatically

4 files changed, 11 insertions, 7 deletions

diff --git a/packaging/osx/Info.plist b/packaging/osx/Info.plist.in
index 4d36c2ff7..7021497a2 100644
--- a/packaging/osx/Info.plist
+++ b/packaging/osx/Info.plist.in
@@ -11,13 +11,13 @@
     <key>CFBundleExecutable</key>
     <string>Deluge</string>
     <key>CFBundleShortVersionString</key>
-    <string>2.0-dev</string>
+    <string>%VERSION%</string>
     <key>CFBundleVersion</key>
-    <string>2.0-dev</string>
+    <string>%VERSION%</string>
     <key>CFBundleGetInfoString</key>
-    <string>2.0-dev (c) 2008-2017 Deluge Team http://deluge-torrent.org/</string>
+    <string>%VERSION% (c) 2008-%YEAR% Deluge Team http://deluge-torrent.org/</string>
     <key>NSHumanReadableCopyright</key>
-    <string>Copyright 2008-2017 Deluge Team</string>
+    <string>Copyright 2008-%YEAR% Deluge Team</string>
     <key>CFBundleDevelopmentRegion</key>
     <string>English</string>
     <key>CFBundleInfoDictionaryVersion</key>
diff --git a/packaging/osx/deluge b/packaging/osx/deluge
index 023977f7d..023977f7d 100644..100755
--- a/packaging/osx/deluge
+++ b/packaging/osx/deluge
diff --git a/packaging/osx/deluge.bundle b/packaging/osx/deluge.bundle
index c65e1f79a..c4abdfc33 100644
--- a/packaging/osx/deluge.bundle
+++ b/packaging/osx/deluge.bundle
@@ -23,17 +23,16 @@
   <binary>${prefix}/lib/pango/1.8.0/modules/pango*.so</binary>
   <binary>${prefix}/lib/libboost_system.dylib</binary>
   <binary>${prefix}/lib/libboost_python.dylib</binary>
-  <binary>${prefix}/lib/libtorrent-rasterbar.8.dylib</binary>
+  <binary>${prefix}/lib/libtorrent-rasterbar.9.dylib</binary>
   <binary>${prefix}/lib/libssl.1.0.0.dylib</binary>
   <binary>${prefix}/lib/libz.1.2.8.dylib</binary>
 
-  <data dest="${bundle}/Contents/Resources/">${project}/../dist/deluge.app/Contents/Resources/</data>
+  <data dest="${bundle}/Contents/Resources/">${project}/../../dist/deluge.app/Contents/Resources/</data>
   <data>${prefix}/lib/pygtk/2.0/</data>
   <!-- gtk theme -->
   <binary>${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/engines/libclearlooks.so</binary>
   <data>${prefix}/share/themes/Clearlooks</data>
   <data>${prefix}/share/themes/Mac</data><!-- required for stock accelerators cmd-X etc... -->
-  <!-- Emacs shortcuts doesn't work: data>${prefix}/share/themes/Emacs</data-->
   <data dest="${bundle}/Contents/Resources/etc/gtk-2.0/gtkrc">${project}/gtkrc</data>
   <data dest="${bundle}/Contents/Resources">${project}/deluge.icns</data>
   <data dest="${bundle}/Contents/Resources">${project}/torrent.icns</data>
diff --git a/packaging/osx/make-app b/packaging/osx/make-app
index ebba5e73e..1353aba63 100644
--- a/packaging/osx/make-app
+++ b/packaging/osx/make-app
@@ -3,6 +3,8 @@
 APPDIR="./app/Deluge.app"
 RSCDIR="${APPDIR}/Contents/Resources"
 LIBDIR="${RSCDIR}/lib"
+VERSION=$(cat ../../RELEASE-VERSION)
+YEAR=$(date +'%Y')
 
 function msg() { echo "==> $1"; }
 
@@ -20,6 +22,9 @@ fi
 
 chmod 755 deluge deluge-web deluge-console deluged
 
+msg "Create Info.plist for Deluge $version"
+sed -e s/%VERSION%/$VERSION/ -e s/%YEAR%/$YEAR/ Info.plist.in > Info.plist
+
 msg "Calling gtk-mac-bundler"
 gtk-mac-bundler deluge.bundle