4 files changed, 42 insertions, 29 deletions
diff --git a/network/RSSOwl/RSSOwl.SlackBuild b/network/RSSOwl/RSSOwl.SlackBuild
index e1d26b48f3..1f9a899cc9 100644
--- a/network/RSSOwl/RSSOwl.SlackBuild
+++ b/network/RSSOwl/RSSOwl.SlackBuild
@@ -1,12 +1,30 @@
 #!/bin/sh
-
+#
 # Slackware build script for RSSOwl
-
+#
 # Written by Vincent Batts, vbatts@hashbangbash.com -2009
-# Maintained by Erik Hanson, erik@slackbuilds.org 2010-
+# Maintained by Erik Hanson, erik@slackbuilds.org 2010-2011
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=RSSOwl
-VERSION=${VERSION:-2.0.6}
+VERSION=${VERSION:-2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -50,12 +68,7 @@ find . \
  -exec chmod 644 {} \;
 
 mkdir -p $PKG/usr/bin
-cat > $PKG/usr/bin/$PRGNAM << EOF
-#!/bin/sh
-cd /usr/lib${LIBDIRSUFFIX}/$PRGNAM/
-./$PRGNAM
-EOF
-chmod 0755 $PKG/usr/bin/$PRGNAM
+ln -s /usr/lib${LIBDIRSUFFIX}/RSSOwl/RSSOwl $PKG/usr/bin/RSSOwl
 
 mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM
 cp -av * $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM
@@ -63,18 +76,8 @@ cp -av * $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM
 mkdir -p $PKG/usr/share/pixmaps
 cp -av icon.xpm $PKG/usr/share/pixmaps/$PRGNAM.xpm
 
-mkdir -p $PKG/usr/share/applications/
-cat > $PKG/usr/share/applications/${PRGNAM}.desktop << EOF
-[Desktop Entry]
-Exec=$PRGNAM
-Icon=$PRGNAM
-Type=Application
-Categories=Network;
-Name=$PRGNAM
-GenericName=RSS News Reader
-MimeType=application/rss+xml;
-X-KDE-StartupNotify=true
-EOF
+mkdir -p $PKG/usr/share/applications
+cp -v $CWD/$PRGNAM.desktop $PKG/usr/share/applications/
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a about* $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/network/RSSOwl/RSSOwl.desktop b/network/RSSOwl/RSSOwl.desktop
new file mode 100644
index 0000000000..6de5a6267e
--- /dev/null
+++ b/network/RSSOwl/RSSOwl.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Exec=RSSOwl
+Icon=RSSOwl
+Type=Application
+Categories=Network;
+Name=RSSOwl
+GenericName=RSS News Reader
+MimeType=application/rss+xml;
+X-KDE-StartupNotify=true
+
diff --git a/network/RSSOwl/RSSOwl.info b/network/RSSOwl/RSSOwl.info
index e67f9c855b..b3e00d6443 100644
--- a/network/RSSOwl/RSSOwl.info
+++ b/network/RSSOwl/RSSOwl.info
@@ -1,10 +1,10 @@
 PRGNAM="RSSOwl"
-VERSION="2.0.6"
+VERSION="2.1"
 HOMEPAGE="http://www.rssowl.org/"
-DOWNLOAD="http://downloads.sourceforge.net/rssowl/rssowl-2.0.6.linux.zip"
-MD5SUM="9a8c2bcb6ba614124fdd7c1487e77820"
-DOWNLOAD_x86_64="http://downloads.sourceforge.net/rssowl/rssowl-2.0.6.linux.x86_64.zip"
-MD5SUM_x86_64="67a38d155cd192e94dc87c0c39bb5b34"
+DOWNLOAD="http://downloads.sourceforge.net/rssowl/rssowl-2.1.linux.x86.zip"
+MD5SUM="c8853ca4474fc557386c5c8b17097576"
+DOWNLOAD_x86_64="http://downloads.sourceforge.net/rssowl/rssowl-2.1.linux.x86_64.zip"
+MD5SUM_x86_64="d84e1f32c7eef6ae8980757d0d74477d"
 MAINTAINER="Erik Hanson"
 EMAIL="erik@slackbuilds.org"
 APPROVED="dsomero"
diff --git a/network/RSSOwl/slack-desc b/network/RSSOwl/slack-desc
index 4381dba636..89835236e7 100644
--- a/network/RSSOwl/slack-desc
+++ b/network/RSSOwl/slack-desc
@@ -11,8 +11,8 @@ RSSOwl:
 RSSOwl: RSSOwl lets you gather, organize, update, and store information
 RSSOwl: from any compliant source in a convenient, easy to use interface,
 RSSOwl: save selected information in various formats for offline viewing
-RSSOwl: and sharing, and much more.  RSSOwl is open source, 
-RSSOwl: licensed under the terms of the Eclipse Public License. 
+RSSOwl: and sharing, and much more.  RSSOwl is open source,
+RSSOwl: licensed under the terms of the Eclipse Public License.
 RSSOwl:
 RSSOwl: Homepage: http://www.rssowl.org/
 RSSOwl: