summaryrefslogtreecommitdiffstats
path: root/redhat/applications/tde-guidance
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2013-06-30 21:15:08 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2013-06-30 21:15:08 +0200
commit2d4b1216e089a2259539e514761f2c11b0b93212 (patch)
tree4c8f8a151cb4be57d09f2f3a019150aa07ff9ef9 /redhat/applications/tde-guidance
parent2150025507b510d1a8c40872487ac191ce12b02b (diff)
downloadtde-packaging-2d4b1216e089a2259539e514761f2c11b0b93212.tar.gz
tde-packaging-2d4b1216e089a2259539e514761f2c11b0b93212.zip
RPM Packaging: updates
Diffstat (limited to 'redhat/applications/tde-guidance')
-rw-r--r--redhat/applications/tde-guidance/tde-guidance-3.5.13.2-fix_mountconfig.patch51
-rw-r--r--redhat/applications/tde-guidance/trinity-tde-guidance-3.5.13.2.spec12
2 files changed, 61 insertions, 2 deletions
diff --git a/redhat/applications/tde-guidance/tde-guidance-3.5.13.2-fix_mountconfig.patch b/redhat/applications/tde-guidance/tde-guidance-3.5.13.2-fix_mountconfig.patch
new file mode 100644
index 000000000..34b15b791
--- /dev/null
+++ b/redhat/applications/tde-guidance/tde-guidance-3.5.13.2-fix_mountconfig.patch
@@ -0,0 +1,51 @@
+commit 3b6ac8e5301bb482b02af7e2b1f0ec613be61218
+Author: Francois Andriot <albator78@libertysurf.fr>
+Date: 1371158323 -0500
+
+ Work around mountconfig incorrectly handling LABEL tag
+ This resolves Bug 1545
+ Add ext4 support
+
+diff --git a/mountconfig/MicroHAL.py b/mountconfig/MicroHAL.py
+index 9ce8b83..9a913fa 100755
+--- a/mountconfig/MicroHAL.py
++++ b/mountconfig/MicroHAL.py
+@@ -669,6 +669,10 @@ class MicroHAL(object):
+
+ if u"volume.label" in parsed_hash:
+ new_device.label = self._parseString(parsed_hash[u"volume.label"][0])
++ # If HAL returns label beginning with '#', it usually means that the
++ # actual label contains an Unix path. So we replace '#' with '/'.
++ if len(new_device.label) and new_device.label[0]=='%':
++ new_device.label = new_device.label.replace('%', '/')
+
+ if u"volume.size" in parsed_hash:
+ size = parsed_hash[u"volume.size"][0]
+diff --git a/mountconfig/mountconfig.py b/mountconfig/mountconfig.py
+index eefa9fd..9c00b7d 100755
+--- a/mountconfig/mountconfig.py
++++ b/mountconfig/mountconfig.py
+@@ -82,6 +82,7 @@ Supported filesystems
+ nfs
+ ext2
+ ext3
++ext4
+ reiserfs
+ vfat
+ ntfs
+@@ -1047,6 +1048,7 @@ class MountEntry(object):
+
+ 'ext2' : (MountEntryExtCommonUnixLocal,i18n("Ext2 - Second Extended FS")),
+ 'ext3' : (MountEntryExtCommonUnixLocal,i18n("Ext3 - Third Extended FS")),
++ 'ext4' : (MountEntryExtCommonUnixLocal,i18n("Ext4 - Fourth Extended FS")),
+ 'reiserfs' : (MountEntryExtCommonUnixLocal,i18n("ReiserFS")),
+ 'reiser4' : (MountEntryExtCommonUnixLocal,i18n("Reiser4")),
+ 'xfs' : (MountEntryExtCommonUnixLocal,i18n("XFS - SGI's journaling filesystem")),
+@@ -2389,6 +2391,7 @@ class MountEntryDialog(KDialogBase):
+ MountTypeEditorsDisk = {
+ 'ext2' : MountEntryDialogOptionsCommonUnix,
+ 'ext3' : MountEntryDialogOptionsCommonUnix,
++ 'ext4' : MountEntryDialogOptionsCommonUnix,
+ 'reiserfs' : MountEntryDialogOptionsCommonUnix,
+ 'reiser4' : MountEntryDialogOptionsCommonUnix,
+ 'xfs' : MountEntryDialogOptionsCommonUnix,
diff --git a/redhat/applications/tde-guidance/trinity-tde-guidance-3.5.13.2.spec b/redhat/applications/tde-guidance/trinity-tde-guidance-3.5.13.2.spec
index 8c4aef75b..6d287c7d3 100644
--- a/redhat/applications/tde-guidance/trinity-tde-guidance-3.5.13.2.spec
+++ b/redhat/applications/tde-guidance/trinity-tde-guidance-3.5.13.2.spec
@@ -28,7 +28,7 @@
Name: trinity-tde-guidance
Summary: A collection of system administration tools for Trinity
Version: 0.8.0svn20080103
-Release: 5%{?dist}%{?_variant}
+Release: 6%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -42,6 +42,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: trinity-tde-guidance-3.5.13.2.tar.gz
+# [tde-guidance] Work around mountconfig incorrectly handling LABEL tag
+# This resolves Bug 1545
+# Add ext4 support
+Patch1: tde-guidance-3.5.13.2-fix_mountconfig.patch
+
BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2
BuildRequires: trinity-tdelibs-devel >= 3.5.13.2
BuildRequires: trinity-tdebase-devel >= 3.5.13.2
@@ -149,7 +154,7 @@ suspend using HAL.
%prep
%setup -q -n trinity-tde-guidance-3.5.13.2
-
+%patch1 -p1 -b .mountconfig
%build
unset QTDIR; . /etc/profile.d/qt3.sh
@@ -423,6 +428,9 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
+* Thu Jun 27 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.0svn20080103-6
+- Work around mountconfig incorrectly handling LABEL tag
+
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.0svn20080103-5
- Initial release for TDE 3.5.13.2