desktop/rss-guard: Updated for version 3.3.5, various cleanups.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

4 files changed, 22 insertions, 26 deletions

diff --git a/desktop/rss-guard/README b/desktop/rss-guard/README
index 5d6f76f3e6..6f6b2f6888 100644
--- a/desktop/rss-guard/README
+++ b/desktop/rss-guard/README
@@ -1,4 +1,4 @@
 RSS Guard is useful and (very) tiny RSS 0.92/1.0/2.0 & ATOM 1.0
-feed reader. It can keep feeds organized in categories, update
-information from them automatically and notice user
-if there is new message.
+feed reader for Qt-5.x. It can keep feeds organized in categories,
+update informations from them automatically and notice the user
+if there is any new message.
diff --git a/desktop/rss-guard/rss-guard.SlackBuild b/desktop/rss-guard/rss-guard.SlackBuild
index befdc6dd0e..470d4565c4 100644
--- a/desktop/rss-guard/rss-guard.SlackBuild
+++ b/desktop/rss-guard/rss-guard.SlackBuild
@@ -24,13 +24,13 @@
 
 PRGNAM=rss-guard
 SRCNAM=rssguard
-VERSION=${VERSION:-3.2.4}
+VERSION=${VERSION:-3.3.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -41,8 +41,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i386" ]; then
+  SLKCFLAGS="-O2 -march=i386 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -61,24 +61,20 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.?z*
+tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || tar xvf $CWD/$VERSION.tar.?z*
 cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir -p build
 cd build
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release ..
+  qmake-qt5 PREFIX=/usr ..
   make
-  make install DESTDIR=$PKG
+  make release-install INSTALL_ROOT=$PKG
 cd ..
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/desktop/rss-guard/rss-guard.info b/desktop/rss-guard/rss-guard.info
index 8c4aecf560..4589139345 100644
--- a/desktop/rss-guard/rss-guard.info
+++ b/desktop/rss-guard/rss-guard.info
@@ -1,8 +1,8 @@
 PRGNAM="rss-guard"
-VERSION="3.2.4"
-HOMEPAGE="https://bitbucket.org/skunkos/rssguard"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/rssguard-3.2.4.tar.xz"
-MD5SUM="d8a88fb835e2e09b4fbe3b0dc4f0714b"
+VERSION="3.3.5"
+HOMEPAGE="https://github.com/martinrotter/rssguard"
+DOWNLOAD="https://github.com/martinrotter/rssguard/archive/3.3.5.tar.gz"
+MD5SUM="9ac44a786afe7b9c5a94e1a81120ada8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qt5"
diff --git a/desktop/rss-guard/slack-desc b/desktop/rss-guard/slack-desc
index 17e4bb5e89..189790aa10 100644
--- a/desktop/rss-guard/slack-desc
+++ b/desktop/rss-guard/slack-desc
@@ -9,11 +9,11 @@
 rss-guard: rss-guard (tiny feed reader)
 rss-guard:
 rss-guard: RSS Guard is useful and (very) tiny RSS 0.92/1.0/2.0 & ATOM 1.0
-rss-guard: feed reader. It can keep feeds organized in categories, update
-rss-guard: information from them automatically and notice user
-rss-guard: if there is new message.
+rss-guard: feed reader for Qt-5.x. It can keep feeds organized in categories,
+rss-guard: update informations from them automatically and notice the user
+rss-guard: if there is any new message.
 rss-guard:
-rss-guard: homepage: http://code.google.com/p/rss-guard/
+rss-guard: homepage: https://github.com/martinrotter/rssguard
 rss-guard:
 rss-guard:
 rss-guard: