diff options
Diffstat (limited to 'redhat/applications')
6 files changed, 113 insertions, 4 deletions
diff --git a/redhat/applications/koffice/trinity-koffice-3.5.13.2.spec b/redhat/applications/koffice/trinity-koffice-3.5.13.2.spec index 57cfda50e..ab290b820 100644 --- a/redhat/applications/koffice/trinity-koffice-3.5.13.2.spec +++ b/redhat/applications/koffice/trinity-koffice-3.5.13.2.spec @@ -149,7 +149,12 @@ BuildRequires: libwpd-devel Obsoletes: trinity-libwpd # WV2 support +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}wv2-devel +%endif +%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} BuildRequires: wv2-devel +%endif # MESA support %if 0%{?mgaversion} || 0%{?mdkversion} 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 diff --git a/redhat/applications/tde-systemsettings/trinity-tde-systemsettings-3.5.13.2.spec b/redhat/applications/tde-systemsettings/trinity-tde-systemsettings-3.5.13.2.spec index e311d1809..767ed5d21 100644 --- a/redhat/applications/tde-systemsettings/trinity-tde-systemsettings-3.5.13.2.spec +++ b/redhat/applications/tde-systemsettings/trinity-tde-systemsettings-3.5.13.2.spec @@ -28,7 +28,7 @@ Name: trinity-tde-systemsettings Summary: easy to use control centre for TDE Version: 0.0svn20070312 -Release: 6%{?dist}%{?_variant} +Release: 7%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -145,6 +145,9 @@ xdg-user-dirs-update %changelog +* Sat Jun 29 2013 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-7 +- Rebuild + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-6 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/tdmtheme/tdmtheme-3.5.13.2-fix_segv.patch b/redhat/applications/tdmtheme/tdmtheme-3.5.13.2-fix_segv.patch new file mode 100644 index 000000000..64272fe6a --- /dev/null +++ b/redhat/applications/tdmtheme/tdmtheme-3.5.13.2-fix_segv.patch @@ -0,0 +1,35 @@ +--- trinity-tdmtheme-3.5.13.2/src/kdmtheme.cpp.ORI 2013-06-13 08:36:49.449599069 +0200 ++++ trinity-tdmtheme-3.5.13.2/src/kdmtheme.cpp 2013-06-13 08:44:01.014366366 +0200 +@@ -268,16 +268,22 @@ + + void KDMThemeWidget::updateInfoView( ThemeData *theme ) + { +- info->setText( +- ((theme->copyright.length() > 0) ? +- i18n("<qt><strong>Copyright:</strong> %1<br/></qt>", +- theme->copyright) : "") + +- ((theme->description.length() > 0) ? +- i18n("<qt><strong>Description:</strong> %1</qt>", +- theme->description) : "") ); +- preview->setPixmap( theme->path + '/' + theme->screenShot ); +- preview->setText( theme->screenShot.isEmpty() ? +- "Screenshot not available" : TQString() ); ++ if(theme) { ++ info->setText( ++ ((theme->copyright.length() > 0) ? ++ i18n("<qt><strong>Copyright:</strong> %1<br/></qt>", ++ theme->copyright) : "") + ++ ((theme->description.length() > 0) ? ++ i18n("<qt><strong>Description:</strong> %1</qt>", ++ theme->description) : "") ); ++ preview->setPixmap( theme->path + '/' + theme->screenShot ); ++ preview->setText( theme->screenShot.isEmpty() ? ++ i18n("Screenshot not available") : TQString() ); ++ } else { ++ info->setText(i18n("No theme selected.")); ++ preview->setPixmap(NULL); ++ preview->setText(i18n("Screenshot not available")); ++ } + } + + void KDMThemeWidget::installNewTheme() diff --git a/redhat/applications/tdmtheme/trinity-tdmtheme-3.5.13.2.spec b/redhat/applications/tdmtheme/trinity-tdmtheme-3.5.13.2.spec index c4962b772..a75c032ef 100644 --- a/redhat/applications/tdmtheme/trinity-tdmtheme-3.5.13.2.spec +++ b/redhat/applications/tdmtheme/trinity-tdmtheme-3.5.13.2.spec @@ -26,7 +26,7 @@ Name: trinity-%{tdecomp} Summary: theme manager for TDM [Trinity] Version: 1.2.2 -Release: 4%{?dist}%{?_variant} +Release: 5%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -40,6 +40,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-3.5.13.2.tar.gz +# [tdmtheme] Fix tdmtheme crash. This resolves Bug 1544 +Patch1: tdmtheme-3.5.13.2-fix_segv.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 @@ -63,6 +66,7 @@ that allows you to easily install, remove and change your KDM themes. %prep %setup -q -n %{name}-3.5.13.2 +%patch1 -p1 -b .segv # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! @@ -121,6 +125,9 @@ update-desktop-database %{tde_appdir} &> /dev/null %changelog +* Thu Jun 27 2013 Francois Andriot <francois.andriot@free.fr> - 1.2.2-5 +- Fix tdmtheme crash. This resolves Bug 1544 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.2.2-4 - Initial release for TDE 3.5.13.2 |