From 4c8dc428713cb354cadb282bb9acd6c6b6b54ecbf121925808c31fe419a80c22 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Tue, 7 Oct 2008 14:09:37 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/polkit-default-privs?expand=0&rev=2

---
 polkit-default-privs.changes | 5 +++++
 polkit-default-privs.spec    | 8 +++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/polkit-default-privs.changes b/polkit-default-privs.changes
index 92f3ea2..02e1626 100644
--- a/polkit-default-privs.changes
+++ b/polkit-default-privs.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Oct  6 22:40:18 CEST 2008 - dmueller@suse.de
+
+- obsolete resmgr and hal-resmgr for openSUSE 11.1 and newer
+
 -------------------------------------------------------------------
 Wed Sep 17 15:06:34 CEST 2008 - lnussel@suse.de
 
diff --git a/polkit-default-privs.spec b/polkit-default-privs.spec
index 4da71c2..3c5726c 100644
--- a/polkit-default-privs.spec
+++ b/polkit-default-privs.spec
@@ -23,7 +23,7 @@ Name:           polkit-default-privs
 License:        GPL v2 or later
 Group:          Productivity/Security
 Version:        0.1_200809171509
-Release:        1
+Release:        2
 Summary:        SUSE PolicyKit default permissions
 Source:         polkit-default-privs-%version.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -31,6 +31,10 @@ Supplements:    PolicyKit
 BuildArch:      noarch
 Url:            http://www.suse.de/~lnussel/polkit-default-privs.git
 PreReq:         %fillup_prereq
+%if %suse_version > 1100
+Obsoletes:      hal-resmgr < 0.2
+Obsoletes:      resmgr < 1.1.1
+%endif
 
 %description
 Different default privilege settings depending on local configuration
@@ -67,6 +71,8 @@ rm -rf $RPM_BUILD_ROOT
 /var/adm/fillup-templates/sysconfig.security-polkit_default_privs
 
 %changelog
+* Tue Oct 07 2008 dmueller@suse.de
+- obsolete resmgr and hal-resmgr for openSUSE 11.1 and newer
 * Wed Sep 17 2008 lnussel@suse.de
 - add manpages
 - do not use SuSEconfig