office/ProjectLibre: Updated for version 1.5.6.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

7 files changed, 30 insertions, 19 deletions

diff --git a/office/ProjectLibre/ProjectLibre.SlackBuild b/office/ProjectLibre/ProjectLibre.SlackBuild
index 25879e4b7f0a6..de9083b611b53 100644
--- a/office/ProjectLibre/ProjectLibre.SlackBuild
+++ b/office/ProjectLibre/ProjectLibre.SlackBuild
@@ -22,7 +22,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ProjectLibre
-VERSION=${VERSION:-1.5.5}
+VERSION=${VERSION:-1.5.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -50,7 +50,7 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Change the installation folder to /opt and fix Java folder
+# Change the installation folder to /opt
 patch -p1 < $CWD/projectlibre-path.patch
 
 mkdir -p $PKG/opt/$PRGNAM/
@@ -61,11 +61,18 @@ cp -rf {lib,license} $PKG/opt/$PRGNAM/
 mkdir -p $PKG/usr/bin
 ln -s /opt/ProjectLibre/projectlibre.sh $PKG/usr/bin/projectlibre
 
+mkdir -p $PKG/usr/share/applications
+cp $CWD/*.desktop $PKG/usr/share/applications
+
+mkdir -p $PKG/usr/share/pixmaps/
+cp $CWD/projectlibre.png $PKG/usr/share/pixmaps/
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/office/ProjectLibre/ProjectLibre.info b/office/ProjectLibre/ProjectLibre.info
index 8441f8f2e9364..4f2ebe9429e14 100644
--- a/office/ProjectLibre/ProjectLibre.info
+++ b/office/ProjectLibre/ProjectLibre.info
@@ -1,8 +1,8 @@
 PRGNAM="ProjectLibre"
-VERSION="1.5.5"
+VERSION="1.5.6"
 HOMEPAGE="http://sourceforge.net/projects/projectlibre/"
-DOWNLOAD="http://downloads.sourceforge.net/projectlibre/projectlibre-1.5.5.tar.gz"
-MD5SUM="a86a8266579e7ad00632f6060639e539"
+DOWNLOAD="http://downloads.sourceforge.net/projectlibre/projectlibre-1.5.6.tar.gz"
+MD5SUM="b8a7331583931ccce732f6ace5426a36"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"
diff --git a/office/ProjectLibre/README b/office/ProjectLibre/README
index 4b3b48728f9e7..90a08f6ba21a9 100644
--- a/office/ProjectLibre/README
+++ b/office/ProjectLibre/README
@@ -1,5 +1,2 @@
 ProjectLibre is a Project Management Software, based on OpenProj, 
 replacement of Microsoft Project. 
-
-Note: This application does not provide any icon used for desktop 
-shortcuts.  Run this application by typing "projectlibre" in terminal.
diff --git a/office/ProjectLibre/doinst.sh b/office/ProjectLibre/doinst.sh
new file mode 100644
index 0000000000000..4e8ba7071dea7
--- /dev/null
+++ b/office/ProjectLibre/doinst.sh
@@ -0,0 +1,4 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/office/ProjectLibre/projectlibre-path.patch b/office/ProjectLibre/projectlibre-path.patch
index 3fd0795e5740f..544fc7ee321e8 100644
--- a/office/ProjectLibre/projectlibre-path.patch
+++ b/office/ProjectLibre/projectlibre-path.patch
@@ -1,14 +1,6 @@
---- projectlibre-1.5_beta4/projectlibre.sh.orig	2012-09-16 15:10:24.135176843 +0700
-+++ projectlibre-1.5_beta4/projectlibre.sh	2012-09-16 15:11:14.134177925 +0700
-@@ -52,7 +52,7 @@
- CONF_DIR="$HOME/.projectlibre"
- RUN_CONF="$CONF_DIR/run.conf"
- VERSION_FILE="$CONF_DIR/java-version"
--JAVA_INSTALL_DIR="/usr/java"
-+JAVA_INSTALL_DIR="/usr/lib"
- JAVA_INSTALL_DIR_EXE="bin/java"
- JAVA_INSTALL_DIR2="/usr/lib/jvm"
- JAVA_INSTALL_DIR_EXE2="bin/java"
+diff -Nur projectlibre-1.5.6.orig/projectlibre.sh projectlibre-1.5.6/projectlibre.sh
+--- projectlibre-1.5.6.orig/projectlibre.sh	2013-06-28 18:27:31.000000000 -0500
++++ projectlibre-1.5.6/projectlibre.sh	2013-07-13 00:47:40.964375049 -0500
 @@ -64,7 +64,7 @@
  JAVA_EXE="java"
  JAVA_OPTS="-Xms128m -Xmx768m"
diff --git a/office/ProjectLibre/projectlibre.desktop b/office/ProjectLibre/projectlibre.desktop
new file mode 100644
index 0000000000000..855fd0532d1da
--- /dev/null
+++ b/office/ProjectLibre/projectlibre.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=ProjectLibre
+Comment=Project Management
+Comment[fr]=Gestion de projet
+Comment[ru]=Управление проектами
+Exec=projectlibre %F
+Icon=/usr/share/pixmaps/projectlibre.png
+Terminal=false
+Type=Application
+Categories=Office;ProjectManagement;
+MimeType=application/x-projectlibre;
diff --git a/office/ProjectLibre/projectlibre.png b/office/ProjectLibre/projectlibre.png
new file mode 100644
index 0000000000000..a68aff0629ffa
--- /dev/null
+++ b/office/ProjectLibre/projectlibre.png