5 files changed, 59 insertions, 34 deletions
diff --git a/network/remmina/README b/network/remmina/README
index 3be35b1cbd..692a84ab91 100644
--- a/network/remmina/README
+++ b/network/remmina/README
@@ -5,10 +5,6 @@ tiny netbooks. Remmina supports multiple network protocols in an
 integrated and consistant user interface. Currently RDP, VNC, NX, 
 XDMCP and SSH are supported.
 
-This package contains the main GTK+ application.
-
-Requires:
-
-  - libssh, for all SSH-related features
-  - libunique, for managing unique process
-  - Avahi, for zeroconf compatibility (optional)
-\ No newline at end of file
+This Requires gnome-keyring, libssh and freerdp. Optionally
+Avahi/Zeroconf support and Telepathy can be used as well, as long one
+passes AVAHI=ON and/or TELEPATHY=ON to the script.
diff --git a/network/remmina/remmina.SlackBuild b/network/remmina/remmina.SlackBuild
index 918685283d..c93d22f8d1 100644
--- a/network/remmina/remmina.SlackBuild
+++ b/network/remmina/remmina.SlackBuild
@@ -3,18 +3,23 @@
 # Slackware build script for remmina
 
 # Written by Luis Henrique <lmello.009@gmail.com>
+# with contributions for the 1.x branch by Niels Horn <niels.horn@gmail.com>
 
 PRGNAM=remmina
-VERSION=${VERSION:-0.8.3}
+VERSION=${VERSION:-1.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
+SRCNAM=Remmina
+UNTARDIR=FreeRDP-$SRCNAM-356c033
+
+AVAHI=${AVAHI:OFF}
+TELEPATHY=${TELEPATHY:OFF}
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -38,14 +43,14 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e # Exit on most errors
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $UNTARDIR
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $UNTARDIR
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -53,27 +58,40 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
+# Fix libdirsuffix in CMakeLists.txt
+sed "s|/lib/remmina|/lib$LIBDIRSUFFIX/remmina|g" -i CMakeLists.txt
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \
+    -DWITH_AVAHI=${AVAHI} \
+    -DWITH_TELEPATHY=${TELEPATHY} \
+    -DCMAKE_BUILD_TYPE=Release ..
 
-make
-make install DESTDIR=$PKG
+  make VERBOSE=1 
+  make install DESTDIR=$PKG
+cd ..
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+# Install desktop file (went MIA upstream, but they already fixed it in 
+# their git repo it seems - so check with next update...)
+mkdir -p $PKG/usr/share/{applications,pixmaps}
+cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
+cat remmina/desktop/scalable/apps/$PRGNAM.svg > $PKG/usr/share/pixmaps/$PRGNAM.svg
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/{remmina,remmina-plugins}
+cp -a README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  remmina/{AUTHORS,COPYING,ChangeLog,INSTALL,NEWS,README} \
+  $PKG/usr/doc/$PRGNAM-$VERSION/remmina
 cp -a \
-  AUTHORS ChangeLog COPYING INSTALL NEWS README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+  remmina-plugins/{AUTHORS,COPYING,ChangeLog,INSTALL,NEWS,README*} \
+  $PKG/usr/doc/$PRGNAM-$VERSION/remmina-plugins
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/remmina/remmina.desktop b/network/remmina/remmina.desktop
new file mode 100644
index 0000000000..1ef82b0730
--- /dev/null
+++ b/network/remmina/remmina.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Name=Remmina Remote Desktop Client
+Comment=Connect to remote desktops
+TryExec=remmina
+Exec=remmina
+Icon=remmina
+Terminal=false
+Type=Application
+Actions=
+Categories=GTK;GNOME;X-GNOME-NetworkSettings;Network;
diff --git a/network/remmina/remmina.info b/network/remmina/remmina.info
index 42c439eef3..975c9fc0df 100644
--- a/network/remmina/remmina.info
+++ b/network/remmina/remmina.info
@@ -1,10 +1,10 @@
 PRGNAM="remmina"
-VERSION="0.8.3"
+VERSION="1.0.0"
 HOMEPAGE="http://remmina.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/remmina/remmina-0.8.3.tar.gz"
-MD5SUM="b4c6830eb6ee5794bd1ca549fb918d16"
+DOWNLOAD="https://github.com/downloads/FreeRDP/Remmina/Remmina-1.0.0.tar.gz"
+MD5SUM="701c540acaab961bc3adf130a2ddb8b1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Luis Henrique"
 EMAIL="lmello.009@gmail.com"
-APPROVED="pprkut"
+APPROVED="Erik Hanson"
diff --git a/network/remmina/slack-desc b/network/remmina/slack-desc
index 0c7bdb51f8..98d650ee35 100644
--- a/network/remmina/slack-desc
+++ b/network/remmina/slack-desc
@@ -15,5 +15,5 @@ remmina: tiny netbooks. Remmina supports multiple network protocols in an
 remmina: integrated and consistant user interface. Currently RDP, VNC, NX, 
 remmina: XDMCP and SSH are supported.
 remmina:
-remmina: This package contains the main GTK+ application.
+remmina:
 remmina: