3 files changed, 32 insertions, 28 deletions
diff --git a/community/root/PKGBUILD b/community/root/PKGBUILD
index 7a191b9eb..239728d51 100644
--- a/community/root/PKGBUILD
+++ b/community/root/PKGBUILD
@@ -2,25 +2,23 @@
 # Contributor: Sebastian Voecking <voeck@web.de>
 
 pkgname=root
-pkgver=5.30.02
+pkgver=5.30.04
 pkgrel=1
 pkgdesc='C++ data analysis framework and interpreter from CERN.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://root.cern.ch'
 license=('LGPL2.1')
 depends=('avahi' 'desktop-file-utils' 'ftgl' 'giflib' 'glew' 'graphviz' 'gsl' 'libldap' 'libmysqlclient'
-         'libxft' 'postgresql-libs' 'python2' 'unixodbc' 'shared-mime-info' 'xmlrpc-c' 'xorg-fonts-75dpi' 'mesa' 'gcc-fortran')
+         'libxft' 'postgresql-libs' 'python2' 'unixodbc' 'shared-mime-info' 'xmlrpc-c' 'xorg-fonts-75dpi' 'mesa' 'gcc-fortran' 'hicolor-icon-theme')
 makedepends=('fftw')
 install='root.install'
 source=("ftp://root.cern.ch/root/root_v${pkgver}.source.tar.gz"
         'root.sh'
         'rootd'
-        'root.desktop'
         'root.xml')
-md5sums=('8a5a5451ddaae276abc9d2e263b29b88'
+md5sums=('800103f8d5ea5f81c06fda95e057a648'
          '0e883ad44f99da9bc7c23bc102800b62'
          'efd06bfa230cc2194b38e0c8939e72af'
-         'ac61b17395d75a2705fefa2ef841a6bf'
          'e2cf69b204192b5889ceb5b4dedc66f7')
 
 build() {
@@ -78,10 +76,20 @@ package() {
     ${pkgdir}/etc/profile.d/root.sh
   install -D ${srcdir}/rootd \
     ${pkgdir}/etc/rc.d/rootd
-  install -D -m644 ${srcdir}/root.desktop \
-    ${pkgdir}/usr/share/applications/root.desktop
   install -D -m644 ${srcdir}/root.xml \
     ${pkgdir}/usr/share/mime/packages/root.xml
 
+  install -D -m644 ${srcdir}/root/build/package/debian/root-system-bin.desktop.in \
+    ${pkgdir}/usr/share/applications/root-system-bin.desktop
+  # replace @prefix@ with /usr for the desktop
+  sed -e 's_@prefix@_/usr_' -i ${pkgdir}/usr/share/applications/root-system-bin.desktop
+
+  install -D -m644 ${srcdir}/root/build/package/debian/root-system-bin.png \
+    ${pkgdir}/usr/share/icons/hicolor/48x48/apps/root-system-bin.png
+
+  # use a file that pacman can track instead of adding directly to ld.so.conf
+  install -d ${pkgdir}/etc/ld.so.conf.d
+  echo '/usr/lib/root' > ${pkgdir}/etc/ld.so.conf.d/root.conf
+
   rm -rf ${pkgdir}/etc/root/daemons
 }
diff --git a/community/root/root.desktop b/community/root/root.desktop
deleted file mode 100644
index ca382111c..000000000
--- a/community/root/root.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Exec=root
-Terminal=true
-Name=ROOT
-Name[de]=ROOT
-Comment=An object-oriented data analysis framework
-Comment[de]=Ein objektorientiertes Framework zur Datenanalyse
-StartupNotify=true
-MimeType=application/x-root;text/x-c++src
-Categories=Science;Development;Application;
diff --git a/community/root/root.install b/community/root/root.install
index 457af7314..afabb7aea 100644
--- a/community/root/root.install
+++ b/community/root/root.install
@@ -1,17 +1,25 @@
 post_install() {
-  if ! [ `grep '/usr/lib/root' etc/ld.so.conf` ]; then
-    echo "/usr/lib/root" >> etc/ld.so.conf
-    sbin/ldconfig -r .
-  fi
-
   update-desktop-database >/dev/null
 
   update-mime-database /usr/share/mime >/dev/null
+
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 pre_remove() {
-  cat etc/ld.so.conf | grep -v '/usr/lib/root' >/tmp/.pacroot
-  mv /tmp/.pacroot etc/ld.so.conf
-  chmod 644 etc/ld.so.conf
-  sbin/ldconfig -r .
+  # leave for pre 5.30.03-3
+  if [[ $(vercmp $1 5.30.03-3) == -1 ]]; then
+    cat etc/ld.so.conf | grep -v '/usr/lib/root' >/tmp/.pacroot
+    mv /tmp/.pacroot etc/ld.so.conf
+    chmod 644 etc/ld.so.conf
+    sbin/ldconfig -r .
+  fi
+}
+
+post_remove() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }