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

[Wolfgang Ulbrich]

commit 34230f927a8b67e269db2b8aa5b5af332efe9315
Merge: 810a874 34a670b
Author: raveit65 <chat-to-me at raveit.de>
Date:   Wed Jan 1 20:28:07 2014 +0100

    Merge branch 'master' into f18

 .gitignore        |    1 +
 mate-applets.spec |   25 ++++++++-----------------
 sources           |    2 +-
 3 files changed, 10 insertions(+), 18 deletions(-)
---
diff --cc mate-applets.spec
index c23ad6b,50ba132..0559a44
--- a/mate-applets.spec
+++ b/mate-applets.spec
@@@ -56,16 -49,10 +49,10 @@@ MATE Desktop panel applet
  %prep
  %setup -q
  %patch0 -p1 -b .cpufreq
- %if 0%{?fedora} > 20
- %patch1 -p1 -b .upower
- %patch2 -p1 -b .fix-upower-version
- %patch3 -p1 -b .use-g_signal-notify
- %endif
- NOCONFIGURE=1 ./autogen.sh
- 
+ autoreconf -fi
  
  %build
 -%configure   \
 +%configure                                   \
      --disable-schemas-compile                \
      --disable-scrollkeeper                   \
  	--disable-static                         \