rpms/nautilus/devel nautilus-2.22.1-show-selinux.diff, NONE, 1.1 nautilus.spec, 1.191, 1.192

[Tomas Bzatek (tbzatek)]

Author: tbzatek

Update of /cvs/extras/rpms/nautilus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9028

Modified Files:
	nautilus.spec 
Added Files:
	nautilus-2.22.1-show-selinux.diff 
Log Message:
* Thu Apr  3 2008 Tomas Bzatek <tbzatek at redhat.com> - 2.22.1-4
- Fix SELinux attributes display issue (#439686)


nautilus-2.22.1-show-selinux.diff:

--- NEW FILE nautilus-2.22.1-show-selinux.diff ---
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);


Index: nautilus.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- nautilus.spec	2 Apr 2008 14:08:53 -0000	1.191
+++ nautilus.spec	3 Apr 2008 15:15:12 -0000	1.192
@@ -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:  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 @@
 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 @@
 %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 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Apr  3 2008 Tomas Bzatek <tbzatek at redhat.com> - 2.22.1-4
+- Fix SELinux attributes display issue (#439686)
+
 * Wed Apr  2 2008 Matthias Clasen <mclasen at redhat.com> - 2.22.1-3
 - Fix the build to include tracker and beagle support again