desktop/murrine: Updated for version 0.90.3

4 files changed, 43 insertions, 34 deletions

diff --git a/desktop/murrine/MurrineThemePack.tar.bz2 b/desktop/murrine/MurrineThemePack.tar.bz2
new file mode 100644
index 0000000000..6a1fac07db
--- /dev/null
+++ b/desktop/murrine/MurrineThemePack.tar.bz2
diff --git a/desktop/murrine/murrine.SlackBuild b/desktop/murrine/murrine.SlackBuild
index 7db179a877..8ac7bf2456 100644
--- a/desktop/murrine/murrine.SlackBuild
+++ b/desktop/murrine/murrine.SlackBuild
@@ -3,14 +3,14 @@
 # Slackware build script for murrine
 # Written by Grigorios Bouzakis (grbzks@gmail.com)
 
-# Modified by the SlackBuilds.org project to include theme support
-set -e
+# Modified by the SlackBuilds.org project
 
 PRGNAM=murrine
-VERSION=0.53.1
+VERSION=0.90.3
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -22,6 +22,8 @@ OUTPUT=${OUTPUT:-/tmp}
 # If you want to use another theme or themepack, ammend the line below.
 THEME=MurrineThemePack
 
+set -e
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
@@ -32,24 +34,14 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -jxvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
- --enable-animation
-
-make
-make install DESTDIR=$PKG
-
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
+find . \
+ \( -perm 777 -o -perm 775 -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 {} \;
 
 # Install a default set of themes in the right directory.
 if [ -r $CWD/$THEME.tar.bz2 ]; then
@@ -57,6 +49,7 @@ if [ -r $CWD/$THEME.tar.bz2 ]; then
     ( cd $PKG/usr/share/themes
       echo "Installing $THEME"
       tar -xvjf $CWD/$THEME.tar.bz2
+      chown -R root:root .
     )
 else
     # Warn users that the package may not work as expected
@@ -77,8 +70,24 @@ else
     fi
 fi
 
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --enable-animation
+
+make
+make install DESTDIR=$PKG
+
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null || true
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
+)
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING CREDITS ChangeLog INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/desktop/murrine/murrine.info b/desktop/murrine/murrine.info
index db6bd2a188..a4c72a62ab 100644
--- a/desktop/murrine/murrine.info
+++ b/desktop/murrine/murrine.info
@@ -1,8 +1,8 @@
 PRGNAM="murrine"
-VERSION="0.53.1"
-HOMEPAGE="http://www.cimitan.com/murrine/project/murrine"
-DOWNLOAD="http://www.cimitan.com/murrine/files/murrine-0.53.1.tar.bz2"
-MD5SUM="09f014584ae593b9795f3f6db26005d8"
+VERSION="0.90.3"
+HOMEPAGE="http://www.cimitan.com/murrine/"
+DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/murrine/0.90/murrine-0.90.3.tar.gz"
+MD5SUM="948ae8df6ac7553e1d28e441a9dd6075"
 MAINTAINER="Grigorios Bouzakis"
 EMAIL="grbzks@gmail.com"
-APPROVED="alien,BP{k}"
+APPROVED="dsomero"
diff --git a/desktop/murrine/slack-desc b/desktop/murrine/slack-desc
index 3e77623b9a..1f03e287eb 100644
--- a/desktop/murrine/slack-desc
+++ b/desktop/murrine/slack-desc
@@ -5,15 +5,15 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-      |-----handy-ruler------------------------------------------------------|
+       |-----handy-ruler------------------------------------------------------|
 murrine: murrine (a Gtk2 engine)
 murrine:
-murrine: Murrine is a Gtk2 engine that will make your desktop
-murrine: look like a Murrina.  Written in C language, it uses 
-murrine: cairo vectorial drawing library to draw widgets.
-murrine: It features  a modern glassy look, and it is elegant
-murrine: and clean on the eyes. 
+murrine: Murrine is a Gtk2 engine that will make your desktop look like a
+murrine: Murrina.  Written in C language, it uses cairo vectorial drawing
+murrine: library to draw widgets. It features  a modern glassy look, and it is
+murrine: elegant and clean on the eyes.
 murrine: It is also extremely customizable.
-murrine:
-murrine: http://murrine.netsons.org/
-murrine:
+murrine: 
+murrine: http://www.cimitan.com/murrine/
+murrine: 
+murrine: