1 files changed, 14 insertions, 12 deletions
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 7afb60d..8a85a9a 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -23,7 +23,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.26.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.26/%{name}-%{version}.tar.bz2
 
@@ -41,7 +41,6 @@ Requires: gnome-menus >= %{gnome_menus_version}
 %if %{use_evolution_data_server}
 Requires: evolution-data-server >= %{evolution_data_server_version}
 %endif
-Requires: PolicyKit-authentication-agent
 Requires: gnome-session-xsession
 
 Requires(post): GConf2 >= %{gconf_version}
@@ -82,8 +81,7 @@ BuildRequires: evolution-data-server-devel >= %{evolution_data_server_version}
 BuildRequires: ORBit2-devel >= %{orbit_version}
 BuildRequires: dbus-devel >= %{dbus_version}
 %endif
-BuildRequires: PolicyKit-devel
-BuildRequires: PolicyKit-gnome-devel
+BuildRequires: polkit-devel >= 0.92
 BuildRequires: libgweather-devel >= %{libgweather_version}
 BuildRequires: librsvg2-devel
 BuildRequires: NetworkManager-devel
@@ -118,6 +116,9 @@ Patch35: clock-wakeups.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=579092
 Patch38: clock-network.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=498366
+Patch42: polkit1.patch
+
 Conflicts: gnome-power-manager < 2.15.3
 
 %description
@@ -165,8 +166,7 @@ Panel Applets using the libpanel-applet library.
 %patch24 -p1 -b .allow-spurious-view-done-signals
 %patch35 -p1 -b .clock-wakeups
 %patch38 -p1 -b .clock-network
-
-libtoolize --force --copy
+%patch42 -p1 -b .polkit1
 
 . %{SOURCE6}
 
@@ -174,6 +174,10 @@ cp -f %{SOURCE3} gnome-panel/panel-default-setup.entries
 cp -f %{SOURCE4} m4
 cp -f %{SOURCE5} gnome-panel/panel-compatibility.schemas
 
+aclocal -I m4
+automake
+autoconf
+
 # strip unneeded translations from .mo files
 # ideally intltool (ha!) would do that for us
 # http://bugzilla.gnome.org/show_bug.cgi?id=474987
@@ -188,11 +192,6 @@ done
 
 
 %build
-# gpm-integration patches Makefile.am and configure.in
-aclocal -I m4
-automake --add-missing
-autoheader
-autoconf
 %configure \
    --disable-gtk-doc \
    --disable-scrollkeeper \
@@ -352,7 +351,7 @@ fi
 
 %{_sysconfdir}/dbus-1/system.d/org.gnome.ClockApplet.Mechanism.conf
 %{_datadir}/dbus-1/system-services/org.gnome.ClockApplet.Mechanism.service
-%{_datadir}/PolicyKit/policy/org.gnome.clockapplet.mechanism.policy
+%{_datadir}/polkit-1/actions/org.gnome.clockapplet.mechanism.policy
 
 %files libs
 %{_libdir}/*.so.*
@@ -366,6 +365,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Tue Jun  9 2009 Matthias Clasen <mclasen@redhat.com> - 2.26.2-3
+- Port to PolicyKit 1
+
 * Tue Jun  2 2009 Matthias Clasen <mclasen@redhat.com> - 2.26.2-2
 - Replace tomboy by gnote in the default panel configuration