[mate-applets/f18: 9/9] fix merge conflicts

[Wolfgang Ulbrich]

commit 8cbbc3ba12f508310000d1800d345c48edbcb3d6
Merge: 3d55c66 e37a6d7
Author: raveit <chat-to-me at raveit.de>
Date:   Sun Jun 2 11:07:16 2013 +0200

    fix merge conflicts

 mate-applets.spec |   76 ++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 55 insertions(+), 21 deletions(-)
---
diff --cc mate-applets.spec
index da2f503,978da96..6de899f
--- a/mate-applets.spec
+++ b/mate-applets.spec
@@@ -30,8 -32,9 +32,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: mate-polkit-devel
+ BuildRequires: polkit-devel
  BuildRequires: pygtk2-devel
  BuildRequires: rarian-compat
  BuildRequires: rarian-devel
@@@ -47,17 -55,16 +54,16 @@@ NOCONFIGURE=1 ./autogen.s
  
  
  %build
 -%configure   \
 +%configure                                   \
      --disable-schemas-compile                \
      --disable-scrollkeeper                   \
+ 	--disable-static                         \
      --with-x                                 \
      --enable-polkit                          \
      --enable-networkmanager                  \
      --enable-ipv6                            \
-     --enable-suid                            \
-     --disable-cpufreq                        \
      --disable-timer-applet                   \
 -    --libexecdir=%{_libexecdir}/mate-applets 
 +    --libexecdir=%{_libexecdir}/mate-applets
  
  make %{?_smp_mflags} V=1