Update to simplify the PKGBUILD

7 files changed, 58 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 640a866c61d8..5a0a974f9e5d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = softmaker-office-2012-bin
 	pkgdesc = Softmaker Office 2012, proprietary office suite; word processing, spreadsheets, presentations
 	pkgver = 2012.702
-	pkgrel = 1
+	pkgrel = 2
 	url = http://softmaker.com
 	install = smoffice2012.install
 	arch = x86_64
@@ -14,26 +14,35 @@ pkgbase = softmaker-office-2012-bin
 	source = presentations12
 	source = textmaker-2012.desktop
 	source = textmaker12
-	source = icons.zip
 	source = license.txt
 	md5sums = df333512e49aea146d21ef0fdf835061
-	md5sums = 5427ac5cd945b7348b1494b3e7744d1c
+	md5sums = 5bf1c347e1fe8304b28e0b5dbfd62a44
 	md5sums = bd742e02bb99c207f0941bf7bf87142a
-	md5sums = b3a09fdac71841226bc6bd483764c373
+	md5sums = deffe64185ea1bdec019fe89bcb239b7
 	md5sums = a26a4a3008db7ed26870e84a8a770be8
-	md5sums = 78b9c32224703ac916e37660a0539ea1
+	md5sums = e370554e5d3c232da168baeda42950ad
 	md5sums = 9e0ad29740ec780afefaec44550a7d20
-	md5sums = 8d00663db0c87693a3464f2d12910443
 	md5sums = 00e002e7ac0f54d5eeaa57c50884f3e9
 	sha512sums = 1299676a51e91616f363877dc02886a17ffb28e4e4792962ffa64aca75fe71930dfc67d720a36f41cacb89ebb5fe8c739b5b8cbe0027ae31b295c2edcc687149
-	sha512sums = 053afd59aa64247bf048d2358104ada35e19d200c03ad923ae0a7c7b69a14c360f8c34dc0edd4e1cb9f375a50f35e2e22e8527b9b453d543ac1b00a4422d4f6f
+	sha512sums = e096dbf916eae537a86d089932130cce26120cb5ce903ca674fed58dbbf5c43ec313e68ec7f3432e903721af0a377ab37baa81f15f8cf3a8bf423a871903c898
 	sha512sums = a0682318dae6894a9eb33797e50ef29f4304856174575f2b0c7cca145b0e8fc297e49c01101e70ea384b67cc0deb66f961a102d2b8dcf5aabc8adf3390516f7a
-	sha512sums = 9bd6e92718c6ae2e045b301bec8c216878b0aa1fd0e04df0c47c09360de9ab8230e93d83630ab11f4d3fda376a72d563ec885556b1d6b0df435222ccd711295c
+	sha512sums = 7ce55190801072226519c2c5f8654b92a23f07960ec1aff3b3ac295cb116c358a40a48a6921f551388de4e54f7fcc75f7a01299c920c8f4f8405ce2cefc7a39b
 	sha512sums = a0d17b147dfe9a5cf1f1eedc2288713c8de15923336a2be4dbe8bff7f75fe456b4e70078fb2aa3b0e286a73feff55b6c28a6ebf0457663019acae574dd08d43e
-	sha512sums = 7ef3fdd09920b6be2704c05494a785c4bf5463c99f4fce14ea42cb52cc32158050b171283e4eb74e02a77131375e9438faac3ee271f6b30d9e7b5b8aa5a1906b
+	sha512sums = 81caa86fa1dd8a297c809964bfcc0b8fc0a7f929f2c17b6fc6e8ec47eddb6ed6105159eebae516f2bbb93e3aceff7abadcc24015d4a4b507daed445f67780fc6
 	sha512sums = 4508a4ae1a983b250608fafac4e3c5cb571768e3b818bd0fdbac9f2b84e9e87deeea9b037c967c5d3086b8ea6df9d4f43d8147558bf59c4b47b2b342d9133509
-	sha512sums = d687ad64f707ddf42d4fff129fb968210d58973d124a8b90e380986e8109e6b4a342d1c7e591ed64f9554079f68d03bba191b6c650cb0544a4ef310f1038c8b6
 	sha512sums = 25464fd669e6d81ccdfd0511e911f7344912e66526cdab4c2dc9fb6e9b65a6f83a328cafe99827bb012800fb2e923f4b00c4a652432710a59597d71759121c33
+	depends_x86_64 = desktop-file-utils
+	depends_x86_64 = shared-mime-info
+	depends_x86_64 = libxrender
+	depends_x86_64 = libxmu
+	depends_x86_64 = gcc-libs
+	depends_x86_64 = hicolor-icon-theme
+	depends_i686 = desktop-file-utils
+	depends_i686 = shared-mime-info
+	depends_i686 = lib32-libxrender
+	depends_i686 = lib32-libxmu
+	depends_i686 = lib32-gcc-libs
+	depends_i686 = hicolor-icon-theme
 
 pkgname = softmaker-office-2012-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index 828dbf78ba2c..3c63f2c8731f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=softmaker-office-2012-bin
 pkgver=2012.702
-pkgrel=1
+pkgrel=2
 pkgdesc="Softmaker Office 2012, proprietary office suite; word processing, spreadsheets, presentations"
 url="http://softmaker.com"
 arch=('x86_64' 'i686')
@@ -11,11 +11,8 @@ license=('custom')
 install=smoffice2012.install
 
 # Set dependencies for i686 or x86-64
-if [ "$CARCH" == "x86_64" ]; then
-   depends=('desktop-file-utils' 'shared-mime-info' 'lib32-libxrender' 'lib32-libxmu' 'lib32-gcc-libs' 'hicolor-icon-theme')
-elif [ "$CARCH" == "i686" ]; then
-   depends=('desktop-file-utils' 'shared-mime-info' 'libxrender' 'libxmu' 'gcc-libs' 'hicolor-icon-theme')
-fi
+depends_i686=('desktop-file-utils' 'shared-mime-info' 'lib32-libxrender' 'lib32-libxmu' 'lib32-gcc-libs' 'hicolor-icon-theme')
+depends_x86_64=('desktop-file-utils' 'shared-mime-info' 'libxrender' 'libxmu' 'gcc-libs' 'hicolor-icon-theme')
 
 source=("http://www.softmaker.net/down/2012/softmaker-office-2012-702.tgz"
         "planmaker-2012.desktop"
@@ -24,40 +21,51 @@ source=("http://www.softmaker.net/down/2012/softmaker-office-2012-702.tgz"
         "presentations12"
         "textmaker-2012.desktop"
         "textmaker12"
-        "icons.zip"
         "license.txt")
 md5sums=('df333512e49aea146d21ef0fdf835061'
-         '5427ac5cd945b7348b1494b3e7744d1c'
+         '5bf1c347e1fe8304b28e0b5dbfd62a44'
          'bd742e02bb99c207f0941bf7bf87142a'
-         'b3a09fdac71841226bc6bd483764c373'
+         'deffe64185ea1bdec019fe89bcb239b7'
          'a26a4a3008db7ed26870e84a8a770be8'
-         '78b9c32224703ac916e37660a0539ea1'
+         'e370554e5d3c232da168baeda42950ad'
          '9e0ad29740ec780afefaec44550a7d20'
-         '8d00663db0c87693a3464f2d12910443'
          '00e002e7ac0f54d5eeaa57c50884f3e9')
 sha512sums=('1299676a51e91616f363877dc02886a17ffb28e4e4792962ffa64aca75fe71930dfc67d720a36f41cacb89ebb5fe8c739b5b8cbe0027ae31b295c2edcc687149'
-            '053afd59aa64247bf048d2358104ada35e19d200c03ad923ae0a7c7b69a14c360f8c34dc0edd4e1cb9f375a50f35e2e22e8527b9b453d543ac1b00a4422d4f6f'
+            'e096dbf916eae537a86d089932130cce26120cb5ce903ca674fed58dbbf5c43ec313e68ec7f3432e903721af0a377ab37baa81f15f8cf3a8bf423a871903c898'
             'a0682318dae6894a9eb33797e50ef29f4304856174575f2b0c7cca145b0e8fc297e49c01101e70ea384b67cc0deb66f961a102d2b8dcf5aabc8adf3390516f7a'
-            '9bd6e92718c6ae2e045b301bec8c216878b0aa1fd0e04df0c47c09360de9ab8230e93d83630ab11f4d3fda376a72d563ec885556b1d6b0df435222ccd711295c'
+            '7ce55190801072226519c2c5f8654b92a23f07960ec1aff3b3ac295cb116c358a40a48a6921f551388de4e54f7fcc75f7a01299c920c8f4f8405ce2cefc7a39b'
             'a0d17b147dfe9a5cf1f1eedc2288713c8de15923336a2be4dbe8bff7f75fe456b4e70078fb2aa3b0e286a73feff55b6c28a6ebf0457663019acae574dd08d43e'
-            '7ef3fdd09920b6be2704c05494a785c4bf5463c99f4fce14ea42cb52cc32158050b171283e4eb74e02a77131375e9438faac3ee271f6b30d9e7b5b8aa5a1906b'
+            '81caa86fa1dd8a297c809964bfcc0b8fc0a7f929f2c17b6fc6e8ec47eddb6ed6105159eebae516f2bbb93e3aceff7abadcc24015d4a4b507daed445f67780fc6'
             '4508a4ae1a983b250608fafac4e3c5cb571768e3b818bd0fdbac9f2b84e9e87deeea9b037c967c5d3086b8ea6df9d4f43d8147558bf59c4b47b2b342d9133509'
-            'd687ad64f707ddf42d4fff129fb968210d58973d124a8b90e380986e8109e6b4a342d1c7e591ed64f9554079f68d03bba191b6c650cb0544a4ef310f1038c8b6'
             '25464fd669e6d81ccdfd0511e911f7344912e66526cdab4c2dc9fb6e9b65a6f83a328cafe99827bb012800fb2e923f4b00c4a652432710a59597d71759121c33')
 
 package() {
    mkdir -p "${pkgdir}/opt/smoffice2012"
-   cd "${pkgdir}/opt/smoffice2012"
-   tar -xzf "${srcdir}/office.tgz"
+   tar -xzf "${srcdir}/office.tgz" -C "${pkgdir}/opt/smoffice2012"
+
    install -Dm755 "${srcdir}/planmaker12" "${pkgdir}/usr/bin/planmaker12"
    install -Dm755 "${srcdir}/presentations12" "${pkgdir}/usr/bin/presentations12"
    install -Dm755 "${srcdir}/textmaker12" "${pkgdir}/usr/bin/textmaker12"
+
    install -Dm644 "${srcdir}/textmaker-2012.desktop" "${pkgdir}/usr/share/applications/textmaker-2012.desktop"
    install -Dm644 "${srcdir}/presentations-2012.desktop" "${pkgdir}/usr/share/applications/presentations-2012.desktop"
    install -Dm644 "${srcdir}/planmaker-2012.desktop" "${pkgdir}/usr/share/applications/planmaker-2012.desktop"
+
    mkdir -p "${pkgdir}"/usr/share/mime/packages
    install -Dm644 "${pkgdir}/opt/smoffice2012/mime/softmaker-office-2012.xml" "${pkgdir}/usr/share/mime/packages"
-   mkdir -p "${pkgdir}"/usr/share/icons/hicolor
-   cp -r "${srcdir}"/hicolor/* "${pkgdir}"/usr/share/icons/hicolor
+
+   for size in 16 32 48
+    do
+      install -d "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps"
+      ln -s "/opt/smoffice2012/icons/pml_${size}.png" "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/smoffice2012-planmaker.png"
+      ln -s "/opt/smoffice2012/icons/prl_${size}.png" "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/smoffice2012-presentations.png"
+      ln -s "/opt/smoffice2012/icons/tml_${size}.png" "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/smoffice2012-textmaker.png"
+
+      install -d "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/mimetypes"
+      ln -s "/opt/smoffice2012/icons/pmd_${size}.png" "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/mimetypes/application-x-pmd.png"
+      ln -s "/opt/smoffice2012/icons/prd_${size}.png" "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/mimetypes/application-x-prd.png"
+      ln -s "/opt/smoffice2012/icons/tmd_${size}.png" "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/mimetypes/application-x-tmd.png"
+    done
+
    install -Dm644 "${srcdir}/license.txt" "${pkgdir}/usr/share/licenses/softmaker-office-bin/license.txt"
 }
diff --git a/icons.zip b/icons.zip
deleted file mode 100644
index 40d4f8f4d920..000000000000
--- a/icons.zip
+++ /dev/null
diff --git a/planmaker-2012.desktop b/planmaker-2012.desktop
index 3048477f12ba..818b71470ebf 100644
--- a/planmaker-2012.desktop
+++ b/planmaker-2012.desktop
@@ -73,7 +73,7 @@ Categories=Application;Office;Spreadsheet
 MimeType=application/x-pmd;application/x-pmv;application/excel;application/x-excel;application/x-ms-excel;application/x-msexcel;application/x-sylk;application/x-xls;application/xls;application/vnd.ms-excel;application/vnd.stardivision.calc;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;
 Version=1.0
 Name=PlanMaker 2012
-Icon=application-x-pml
+Icon=smoffice2012-planmaker
 TryExec=/usr/bin/planmaker12
 StartupWMClass=pm
 Exec=/usr/bin/planmaker12 %F
diff --git a/presentations-2012.desktop b/presentations-2012.desktop
index b404bf1f8c6c..73e7f0d28a26 100644
--- a/presentations-2012.desktop
+++ b/presentations-2012.desktop
@@ -72,7 +72,7 @@ Categories=Application;Office;Presentation
 MimeType=application/x-prd;application/x-prv;application/x-prs;application/ppt;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12;application/vnd.ms-powerpoint.slideshow.macroEnabled.12;application/vnd.openxmlformats-officedocument.presentationml.slideshow;
 Version=1.0
 Name=Presentations 2012
-Icon=application-x-prl
+Icon=smoffice2012-presentations
 TryExec=/usr/bin/presentations12
 StartupWMClass=pr
 Exec=/usr/bin/presentations12 %F
diff --git a/smoffice2012.install b/smoffice2012.install
index 5a3a5463215c..9f9a52e6de96 100644
--- a/smoffice2012.install
+++ b/smoffice2012.install
@@ -1,13 +1,17 @@
-post_install() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime
+do_update() {
   xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+  update-mime-database usr/share/mime &> /dev/null
+  update-desktop-database -q
+}
+
+post_install() {
+  do_update
 }
 
 post_upgrade() {
-  post_install
+  do_update
 }
 
 post_remove () {
-  post_install
+  do_update
 }
diff --git a/textmaker-2012.desktop b/textmaker-2012.desktop
index ad17d3c83232..8e3fbe9a9dfa 100644
--- a/textmaker-2012.desktop
+++ b/textmaker-2012.desktop
@@ -72,7 +72,7 @@ Categories=Application;Office;WordProcessor
 MimeType=application/x-tmd;application/x-tmv;application/msword;application/vnd.ms-word;application/x-doc;text/rtf;application/rtf;application/rtf;application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.stardivision.writer;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;application/x-pocket-word;
 Version=1.0
 Name=TextMaker 2012
-Icon=application-x-tml
+Icon=smoffice2012-textmaker
 TryExec=/usr/bin/textmaker12
 StartupWMClass=tm
 Exec=/usr/bin/textmaker12 %F