From 1e01e5c8c3f2b822fdec2375232403a3e8f1970d Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Apr 03 2008 15:15:12 +0000 Subject: - Fix SELinux attributes display issue (#439686) --- diff --git a/nautilus-2.22.1-show-selinux.diff b/nautilus-2.22.1-show-selinux.diff new file mode 100644 index 0000000..8ec44a6 --- /dev/null +++ b/nautilus-2.22.1-show-selinux.diff @@ -0,0 +1,13 @@ +Index: libnautilus-private/nautilus-file.c +=================================================================== +--- libnautilus-private/nautilus-file.c (revision 14026) ++++ libnautilus-private/nautilus-file.c (working copy) +@@ -1799,7 +1799,7 @@ + eel_ref_str_unref (file->details->mime_type); + file->details->mime_type = eel_ref_str_get_unique (mime_type); + +- selinux_context = g_file_info_get_attribute_string (info, "selinux:context"); ++ selinux_context = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_SELINUX_CONTEXT); + if (eel_strcmp (file->details->selinux_context, selinux_context) != 0) { + changed = TRUE; + g_free (file->details->selinux_context); diff --git a/nautilus.spec b/nautilus.spec index b2716de..8d6bba9 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -19,7 +19,7 @@ Name: nautilus Summary: Nautilus is a file manager for GNOME Version: 2.22.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: User Interface/Desktops Source: http://download.gnome.org/sources/%{name}/2.22/%{name}-%{version}.tar.bz2 @@ -61,6 +61,7 @@ BuildRequires: startup-notification-devel >= %{startup_notification_version} BuildRequires: libexif-devel >= %{libexif_version} BuildRequires: exempi-devel >= %{exempi_version} BuildRequires: gettext +BuildRequires: libselinux-devel # For intltool: BuildRequires: perl(XML::Parser) >= 2.31-16 @@ -85,6 +86,9 @@ Patch6: nautilus-2.22.1-dynamic-search.patch Patch7: rtl-fix.patch Patch8: nautilus-2.22.1-hide-white-screen.patch +# patch from head +Patch9: nautilus-2.22.1-show-selinux.diff + %description Nautilus integrates access to files, applications, media, @@ -121,6 +125,7 @@ for writing nautilus extensions. %patch6 -p1 -b .dynamic-search %patch7 -p1 -b .rtl-fix %patch8 -p1 -b .hide-white-screen +%patch9 -p0 -b .selinux %build @@ -231,6 +236,9 @@ fi %{_libdir}/*.so %changelog +* Thu Apr 3 2008 Tomas Bzatek - 2.22.1-4 +- Fix SELinux attributes display issue (#439686) + * Wed Apr 2 2008 Matthias Clasen - 2.22.1-3 - Fix the build to include tracker and beagle support again