From 01e1dae06ba453b5c1d85d5a0c23107d90302dc7 Mon Sep 17 00:00:00 2001
From: Miloslav Trmac <mitr@fedoraproject.org>
Date: Fri, 29 Feb 2008 15:54:18 +0000
Subject: [PATCH] - Remove code that overrides SELinux contexts of processes
 started by     userhelper. Related: #247967 - Delete the WITH_SELINUX
 variable.

---
 .cvsignore    |  2 +-
 sources       |  2 +-
 usermode.spec | 19 ++++++++-----------
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 162658a..2aaf2ca 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-usermode-1.95.tar.bz2
+usermode-1.96.tar.bz2
diff --git a/sources b/sources
index 51d58b7..6b13ab6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dc0eb5efcae09f81c655d65e1bc45e04  usermode-1.95.tar.bz2
+510282133c56f98af0f18c2cf040abc6  usermode-1.96.tar.bz2
diff --git a/usermode.spec b/usermode.spec
index 287deb7..90f82c4 100644
--- a/usermode.spec
+++ b/usermode.spec
@@ -1,10 +1,6 @@
-%if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
-%define WITH_SELINUX 1
-%endif
-
 Summary: Tools for certain user account management tasks
 Name: usermode
-Version: 1.95
+Version: 1.96
 Release: 1
 License: GPLv2+
 Group: Applications/System
@@ -16,9 +12,7 @@ Conflicts: SysVinit < 2.74-14
 BuildRequires: desktop-file-utils, e2fsprogs-devel, glib2-devel, gtk2-devel
 BuildRequires: libglade2-devel, libuser-devel, pam-devel, util-linux
 BuildRequires: perl-XML-Parser, libSM-devel, startup-notification-devel, gettext
-%if %{WITH_SELINUX}
 BuildRequires: libselinux-devel >= 1.17.13-2
-%endif
 BuildRoot: %{_tmppath}/%{name}-root
 
 %package gtk
@@ -45,10 +39,7 @@ graphical tools for certain account management tasks.
 %setup -q
 
 %build
-%configure \
-%if %{WITH_SELINUX}
-	--with-selinux
-%endif
+%configure --with-selinux
 
 make
 
@@ -121,6 +112,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/*
 
 %changelog
+* Fri Feb 29 2008 Miloslav Trmač <mitr@redhat.com> - 1.96-1
+- Remove code that overrides SELinux contexts of processes started by
+  userhelper.
+  Related: #247967
+- Delete the WITH_SELINUX variable.
+
 * Mon Feb 25 2008 Miloslav Trmač <mitr@redhat.com> - 1.95-1
 - New home page at https://fedorahosted.org/usermode/
 - Correctly preserve exit code when SESSION=yes