[mate-applets/f18: 3/3] Merge branch 'master' into f18

[Dan Mashal]

commit 3d55c66c0abf423e6f996300802e44691791d063
Merge: 8773ad2 adeb863
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Wed May 29 00:12:17 2013 -0700

    Merge branch 'master' into f18
    
    Conflicts:
    	mate-applets.spec

 mate-applets.spec |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --cc mate-applets.spec
index 3f513f6,0963db8..da2f503
--- a/mate-applets.spec
+++ b/mate-applets.spec
@@@ -29,8 -30,9 +30,8 @@@ BuildRequires: mate-file-manager-deve
  BuildRequires: mate-icon-theme-devel
  BuildRequires: mate-keyring-devel
  BuildRequires: mate-menus-devel
 -BuildRequires: mate-notification-daemon
  BuildRequires: mate-panel-devel
- BuildRequires: polkit-devel
+ BuildRequires: mate-polkit-devel
  BuildRequires: pygtk2-devel
  BuildRequires: rarian-compat
  BuildRequires: rarian-devel
@@@ -53,11 -54,9 +54,10 @@@ NOCONFIGURE=1 ./autogen.s
      --enable-polkit                          \
      --enable-networkmanager                  \
      --enable-ipv6                            \
-     --enable-frequency-selector              \
      --enable-suid                            \
 +    --disable-cpufreq                        \
      --disable-timer-applet                   \
 -    --libexecdir=%{_libexecdir}/mate-applets 
 +    --libexecdir=%{_libexecdir}/mate-applets
  
  make %{?_smp_mflags} V=1