system/disk-manager: Updated for version 1.1.1.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

6 files changed, 99 insertions, 12 deletions

diff --git a/system/disk-manager/02-fix_desktop_files.patch b/system/disk-manager/02-fix_desktop_files.patch
new file mode 100644
index 0000000000..0a54e3af70
--- /dev/null
+++ b/system/disk-manager/02-fix_desktop_files.patch
@@ -0,0 +1,27 @@
+From: David Paleino <dapal@debian.org>
+Subject: Remove deprecated and useless fields
+Forwarded: no
+
+---
+ data/disk-manager.desktop.in.in |    2 --
+ po/POTFILES.skip                |    3 ++-
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+--- disk-manager.orig/data/disk-manager.desktop.in.in
++++ disk-manager/data/disk-manager.desktop.in.in
+@@ -1,7 +1,5 @@
+ [Desktop Entry]
+ Version=1.0
+-Encoding=UTF-8
+-Name=Aucun nom
+ _Name=Disk Manager
+ _Comment=Manage filesystem configuration
+ Icon=disk-manager
+--- disk-manager.orig/po/POTFILES.skip
++++ disk-manager/po/POTFILES.skip
+@@ -1,2 +1,3 @@
+ data/disk-manager.desktop.in
+-data/disk-manager-1.2.glade
+\ No newline at end of file
++data/disk-manager-1.2.glade
++.pc/02-fix_desktop_files.patch/data/disk-manager.desktop.in.in
diff --git a/system/disk-manager/03-fix_translation.patch b/system/disk-manager/03-fix_translation.patch
new file mode 100644
index 0000000000..8190549f66
--- /dev/null
+++ b/system/disk-manager/03-fix_translation.patch
@@ -0,0 +1,28 @@
+From: David Paleino <dapal@debian.org>
+Subject: Fix italian translation
+Forwarded: no
+
+---
+ po/it.po |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- disk-manager.orig/po/it.po
++++ disk-manager/po/it.po
+@@ -272,7 +272,7 @@ msgid ""
+ "<i>%s</i> is not formatted correctly.\n"
+ "Options should be separated by coma (,)"
+ msgstr ""
+-"<i>%ss</i> non è correttamente formattato.\n"
++"<i>%s</i> non è correttamente formattato.\n"
+ "Le opzioni dovrebbero essere separata da una virgola (,)"
+ 
+ #: ../DiskManager/Dialogs.py:258 ../DiskManager/DiskManager.py:400
+@@ -613,7 +613,7 @@ msgstr "Usa l'opzione «force»"
+ #~ msgstr "<b>Stato</b>"
+ 
+ #~ msgid "Advanced configuration"
+-#~ msgstr "Configrazione avanzata"
++#~ msgstr "Configurazione avanzata"
+ 
+ #, fuzzy
+ #~ msgid "Apply policy for all partitions"
diff --git a/system/disk-manager/06-private_pythonlib.patch b/system/disk-manager/06-private_pythonlib.patch
new file mode 100644
index 0000000000..b3fe1d782a
--- /dev/null
+++ b/system/disk-manager/06-private_pythonlib.patch
@@ -0,0 +1,29 @@
+Author: Stefano Rivera <stefano@rivera.za.net>
+Description: We use a private Python module directory, patch it into sys.path
+ at the start of the binaries.
+Forwarded: not-needed
+Last-Update: 2010-06-27
+
+---
+ disk-manager.in |   10 +---------
+ 1 file changed, 1 insertion(+), 9 deletions(-)
+
+--- disk-manager.orig/disk-manager.in
++++ disk-manager/disk-manager.in
+@@ -29,15 +29,7 @@ from gettext import gettext as _
+ 
+ import gtk
+ 
+-# Hack to make sure that path is set correctly when installation is in /usr/local
+-if "/usr/local" in sys.argv[0] :
+-    for path in sys.path[:] :
+-        if "/usr/" in path :
+-            local_path = path.replace("/usr", "/usr/local")
+-            if not local_path in sys.path :
+-                sys.path.append(path.replace("/usr", "/usr/local"))
+-                
+-print sys.path
++sys.path.insert(0, '/usr/share/disk-manager')
+ 
+ from DiskManager.DiskManager import *
+ from DiskManager.Config import Config
diff --git a/system/disk-manager/README b/system/disk-manager/README
index 1e061ca035..b1dfac52b4 100644
--- a/system/disk-manager/README
+++ b/system/disk-manager/README
@@ -8,4 +8,4 @@ Disk manager is a simple filesystem configurator that allows you to:
 * Fully manage configuration of filesystem.
 * Enable/disable write support for NTFS (needs ntfs-3g installed).
 
-This require: ktsuss, xfsudo or gksu for authenticated method.
+This require: ktsuss, xfsudo, gksu or kdesu for authenticated method.
diff --git a/system/disk-manager/disk-manager.SlackBuild b/system/disk-manager/disk-manager.SlackBuild
index d17c9a4f5f..705641dadd 100644
--- a/system/disk-manager/disk-manager.SlackBuild
+++ b/system/disk-manager/disk-manager.SlackBuild
@@ -1,7 +1,8 @@
 #!/bin/sh
+#
 # Slackware build script for disk-manager.
-
-# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+#
+# Copyright 2015-2017 Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,13 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=disk-manager
-VERSION=${VERSION:-1.0.1}
+VERSION=${VERSION:-1.1.1}
 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
@@ -39,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -59,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/${PRGNAM}_${VERSION}.orig.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -68,7 +69,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-patch -p1 < $CWD/disk-manager-1.0.1-3.diff
+patch -p1 < $CWD/02-fix_desktop_files.patch
+patch -p1 < $CWD/03-fix_translation.patch
+patch -p1 < $CWD/06-private_pythonlib.patch
 mkdir -p $PKG/etc/hal/fdi/policy
 
 CFLAGS="$SLKCFLAGS" \
diff --git a/system/disk-manager/disk-manager.info b/system/disk-manager/disk-manager.info
index 35166018e8..d952818ba2 100644
--- a/system/disk-manager/disk-manager.info
+++ b/system/disk-manager/disk-manager.info
@@ -1,8 +1,8 @@
 PRGNAM="disk-manager"
-VERSION="1.0.1"
+VERSION="1.1.1"
 HOMEPAGE="http://flomertens.free.fr/disk-manager/"
-DOWNLOAD="http://flomertens.free.fr/disk-manager/download/source/disk-manager-1.0.1.tar.gz"
-MD5SUM="904f47f2b2d51871fa4d0ee6f9051921"
+DOWNLOAD="http://http.debian.net/debian/pool/main/d/disk-manager/disk-manager_1.1.1.orig.tar.gz"
+MD5SUM="41bdb4693da535fdd2d3ce2f5e1a37d9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""