From 3128765b674b4fb59aa49ab203d2d19609b72dcc Mon Sep 17 00:00:00 2001
From: Robby Workman <rworkman@slackbuilds.org>
Date: Wed, 19 May 2010 14:37:45 -0500
Subject: network/liferea: Miscellaneous cleanups.

---
 network/liferea/README             | 11 +++++------
 network/liferea/doinst.sh          |  1 +
 network/liferea/liferea.SlackBuild | 16 ++++++++++++++--
 network/liferea/slack-desc         |  4 ++--
 4 files changed, 22 insertions(+), 10 deletions(-)

(limited to 'network')

diff --git a/network/liferea/README b/network/liferea/README
index b6b1a0076a0e..d0bd680bb72a 100644
--- a/network/liferea/README
+++ b/network/liferea/README
@@ -1,7 +1,6 @@
-Liferea is an aggregator for online news feeds. There are many
-other news readers available, but these others are not available
-for Linux or require many extra libraries to be installed.
-Liferea tries to fill this gap by creating a fast, easy to use,
-easy to install news aggregator for GTK/GNOME.
+Liferea is an aggregator for online news feeds.  There are many other news 
+readers available, but these others are not available for Linux or require 
+many extra libraries to be installed.  Liferea tries to fill this gap by 
+creating a fast, easy to use, easy to install news aggregator for GTK/GNOME.
 
-Requires GConf and libnotify, available at SlackBuilds.org.
+This requires GConf.
diff --git a/network/liferea/doinst.sh b/network/liferea/doinst.sh
index 51a03bc8f788..2a7fc52c2f34 100644
--- a/network/liferea/doinst.sh
+++ b/network/liferea/doinst.sh
@@ -11,3 +11,4 @@ schema_install liferea.schemas
 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/network/liferea/liferea.SlackBuild b/network/liferea/liferea.SlackBuild
index d1cbe7149ca1..a58fae4c5315 100644
--- a/network/liferea/liferea.SlackBuild
+++ b/network/liferea/liferea.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for liferea
 #
-# Copyright 2009-2010  Erik W. Hanson, Minneapolis, MN, USA
+# Copyright 2009,2010  Erik W. Hanson, Minneapolis, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,10 +24,19 @@
 
 PRGNAM=liferea
 VERSION=1.4.28
-ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -42,6 +51,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 set -eu
diff --git a/network/liferea/slack-desc b/network/liferea/slack-desc
index a33afe59fa4d..901dd1ee903c 100644
--- a/network/liferea/slack-desc
+++ b/network/liferea/slack-desc
@@ -7,13 +7,13 @@
 
        |-----handy-ruler----------------------------------------------------|
 liferea: liferea (A simple and free GTK desktop news aggregator for Unix)
-liferea: 
+liferea:
 liferea: Liferea is an aggregator for online news feeds. There are many
 liferea: other news readers available, but these others are not available
 liferea: for Linux or require many extra libraries to be installed.
 liferea: Liferea tries to fill this gap by creating a fast, easy to use,
 liferea: easy to install news aggregator for GTK/GNOME.
 liferea:
-liferea:
 liferea: http://liferea.sourceforge.net/
 liferea:
+liferea:
-- 
cgit v1.2.3