- general cleanup, more dependencies

- restored m4_fix patch to get rid of $s from some path beginnings
- fixed applets help packaging

diff --git a/mate-applets.spec b/mate-applets.spec
index 6f1412c00927dadae2b780a15e19fc6c56d46c89..9b1d7574b8f62f110116309ff9c1d89b902e5543 100644 (file)
--- a/mate-applets.spec
+++ b/mate-applets.spec
@@ -1,7 +1,7 @@
 # TODO
 # - build:
 #        - timer-applet
-# - cpufreq applet does not startup
+# - cpufreq applet does not start
 Summary:       Small applications which embed themselves in the MATE panel
 Summary(pl.UTF-8):     Aplety MATE - małe aplikacje osadzające się w panelu
 Summary(ru.UTF-8):     Маленькие программы, встраивающиеся в панель MATE
@@ -9,50 +9,51 @@ Summary(uk.UTF-8):    Маленькі програми, що вбудовують
 Name:          mate-applets
 Version:       1.6.1
 Release:       1
-License:       GPL v2, FDL
+License:       GPL v2+ (applets), FDL (help)
 Group:         X11/Applications
 Source0:       http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
 # Source0-md5: 56c4570510b776d8da858f55b32482ef
 # check paths in Makefile before removing it!
-#Patch0: m4_fix.patch
-Patch0:                uidir.patch
-Patch1:                use-libwnck.patch
+Patch0:                m4_fix.patch
+Patch1:                uidir.patch
+Patch2:                use-libwnck.patch
 URL:           https://github.com/mate-desktop/mate-applets
 BuildRequires: NetworkManager-devel >= 0.7
 BuildRequires: autoconf >= 2.59
-BuildRequires: automake >= 1:1.8
+BuildRequires: automake >= 1:1.9
 BuildRequires: cpufrequtils-devel >= 0.3
 BuildRequires: dbus-devel >= 1.1.1
 BuildRequires: dbus-glib-devel >= 0.74
-BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.22.0
+BuildRequires: gettext-devel >= 0.10.40
+BuildRequires: glib2-devel >= 1:2.26.0
 BuildRequires: gtk+2-devel >= 2:2.20.0
 BuildRequires: intltool >= 0.40.0
 BuildRequires: libgtop-devel >= 1:2.11.92
 BuildRequires: libmateweather-devel >= 1.6.1
 BuildRequires: libnotify-devel >= 0.7.0
-BuildRequires: libtool
+BuildRequires: libtool >= 1:1.4.3
 BuildRequires: libwnck2-devel >= 2.9.3
 BuildRequires: libxml2-devel >= 1:2.5.0
+BuildRequires: mate-common >= 1.1.0
 BuildRequires: mate-desktop-devel >= 1.1.0
-BuildRequires: mate-doc-utils >= 0.3.2
+BuildRequires: mate-doc-utils >= 1.1.0
 BuildRequires: mate-icon-theme-devel >= 1.1.0
 BuildRequires: mate-panel-devel >= 1.5.2
 BuildRequires: pkgconfig >= 1:0.19
 BuildRequires: polkit-devel >= 0.92
 BuildRequires: python-devel >= 1:2.4
+# just for outdated configure checks; invest applet uses pygobject3 + gtk+2 gobject binding
 BuildRequires: python-pygobject-devel >= 2.6
 BuildRequires: python-pygtk-devel >= 2:2.6
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(find_lang) >= 1.36
 BuildRequires: rpmbuild(macros) >= 1.311
+BuildRequires: sed >= 4.0
 BuildRequires: tar >= 1:1.22
 BuildRequires: upower-devel >= 0.9.4
+BuildRequires: xorg-lib-libX11-devel
 BuildRequires: xz
-Requires(post,postun): gtk-update-icon-cache
-Requires(post,postun): hicolor-icon-theme
 Requires:      gnome-icon-theme >= 2.26.0
-Requires:      mate-panel >= 1.5
 # sr@Latn vs. sr@latin
 Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -79,8 +80,12 @@ z MATE.
 Summary:       Keyboard Accessibility Status applet
 Summary(pl.UTF-8):     Aplet stanu dostepności klawiatury
 Group:         X11/Applications
-Requires(post,postun): gtk+2
+Requires(post,postun): gtk-update-icon-cache
 Requires:      %{name} = %{version}-%{release}
+Requires:      glib2 >= 1:2.26.0
+Requires:      gtk+2 >= 2:2.20.0
+Requires:      mate-icon-theme-devel >= 1.1.0
+Requires:      mate-panel >= 1.5.2
 Suggests:      mate-control-center >= 1.5
 
 %description -n mate-applet-accessx-status
@@ -101,6 +106,10 @@ Summary(pl.UTF-8): Aplet monitora stanu naładowania akumulatora
 Group:         X11/Applications
 Requires:      %{name} = %{version}-%{release}
 Requires:      glib2 >= 1:2.26.0
+Requires:      gtk+2 >= 2:2.20.0
+Requires:      libnotify >= 0.7.0
+Requires:      mate-panel >= 1.5.2
+Requires:      upower >= 0.9.4
 
 %description -n mate-applet-battstat
 The Battery Charge Monitor shows the status of any batteries in your
@@ -118,9 +127,12 @@ pozostały czas pracy przy założeniu bieżącego użycia prądu.
 Summary:       Character Palette applet
 Summary(pl.UTF-8):     Aplet palety znaków
 Group:         X11/Applications
-Requires(post,postun): gtk+2
+Requires(post,postun): gtk-update-icon-cache
 Requires:      %{name} = %{version}-%{release}
 Requires:      glib2 >= 1:2.26.0
+Requires:      gtk+2 >= 2:2.20.0
+Requires:      hicolor-icon-theme
+Requires:      mate-panel >= 1.5.2
 
 %description -n mate-applet-charpicker
 The Character Palette provides a convenient way to access characters
@@ -150,9 +162,14 @@ do wyświetlania lub kopiowania dowolnych znaków unikodowych.
 Summary:       CPU Frequency Scaling Monitor applet
 Summary(pl.UTF-8):     Aplet monitora częstotliwości procesora
 Group:         X11/Applications
-Requires(post,postun): gtk+2
+Requires(post,postun): gtk-update-icon-cache
 Requires:      %{name} = %{version}-%{release}
+Requires:      cpufrequtils-libs >= 0.3
+Requires:      gtk+2 >= 2:2.20.0
+Requires:      hicolor-icon-theme
+Requires:      mate-panel >= 1.5.2
 Requires:      mate-polkit
+Requires:      polkit >= 0.92
 
 %description -n mate-applet-cpufreq
 The CPU Frequency Scaling Monitor provides a convenient way to monitor
@@ -168,6 +185,8 @@ Summary(pl.UTF-8):  Aplet do montowania dysków
 Group:         X11/Applications
 Requires:      %{name} = %{version}-%{release}
 Requires:      glib2 >= 1:2.26.0
+Requires:      gtk+2 >= 2:2.20.0
+Requires:      mate-panel >= 1.5.2
 
 %description -n mate-applet-drivemount
 The Disk Mounter enables you to quickly mount and unmount various
@@ -181,9 +200,12 @@ różne rodzaje dysków i systemów plików.
 Summary:       Geyes applet - tracking the mouse pointer
 Summary(pl.UTF-8):     Aplet geyes - śledzenie wskaźnika myszy
 Group:         X11/Applications
-Requires(post,postun): gtk+2
+Requires(post,postun): gtk-update-icon-cache
 Requires:      %{name} = %{version}-%{release}
 Requires:      glib2 >= 1:2.26.0
+Requires:      gtk+2 >= 2:2.20.0
+Requires:      hicolor-icon-theme
+Requires:      mate-panel >= 1.5.2
 
 %description -n mate-applet-geyes
 The Geyes applet provides an entertaining way to track the movement of
@@ -200,7 +222,14 @@ Summary:   Weather Report applet
 Summary(pl.UTF-8):     Aplet raportu pogodowego
 Group:         X11/Applications
 Requires:      %{name} = %{version}-%{release}
+Requires:      dbus >= 1.1.1
+Requires:      dbus-glib >= 0.74
 Requires:      dbus(org.freedesktop.Notifications)
+Requires:      glib2 >= 1:2.26.0
+Requires:      gtk+2 >= 2:2.20.0
+Requires:      libmateweather >= 1.6.1
+Requires:      libnotify >= 0.7.0
+Requires:      mate-panel >= 1.5.2
 
 %description -n mate-applet-gweather
 The Weather Report downloads weather information from the U.S.
@@ -220,8 +249,14 @@ prognoz.
 Summary:       Stock Ticker applet
 Summary(pl.UTF-8):     Aplet wskaźnika giełdowego
 Group:         X11/Applications
+Requires(post,postun): gtk-update-icon-cache
 Requires:      %{name} = %{version}-%{release}
-Requires:      mate-panel
+Requires:      glib2 >= 1:2.26.0
+Requires:      gtk+2 >= 2:2.20.0
+Requires:      hicolor-icon-theme
+Requires:      mate-panel >= 1.5.2
+Requires:      python-dbus
+Requires:      python-pygobject3 >= 3
 
 %description -n mate-applet-invest
 The Invest MATE panel applet downloads current stock quotes from
@@ -237,6 +272,9 @@ Summary(pl.UTF-8):  Aplet monitora systemu
 Group:         X11/Applications
 Requires:      %{name} = %{version}-%{release}
 Requires:      glib2 >= 1:2.26.0
+Requires:      gtk+2 >= 2:2.20.0
+Requires:      libgtop >= 1:2.11.92
+Requires:      mate-panel >= 1.5.2
 Suggests:      mate-system-monitor >= 1.5
 
 %description -n mate-applet-multiload
@@ -251,9 +289,14 @@ systemu w postaci graficznej.
 Summary:       Sticky Notes applet
 Summary(pl.UTF-8):     Aplet notatek
 Group:         X11/Applications
-Requires(post,postun): gtk+2
+Requires(post,postun): gtk-update-icon-cache
 Requires:      %{name} = %{version}-%{release}
 Requires:      glib2 >= 1:2.26.0
+Requires:      gtk+2 >= 2:2.20.0
+Requires:      hicolor-icon-theme
+Requires:      libwnck2 >= 2.9.3
+Requires:      libxml2 >= 1:2.5.0
+Requires:      mate-panel >= 1.5.2
 
 %description -n mate-applet-stickynotes
 The Sticky Notes panel application enables you to create, view, and
@@ -276,6 +319,9 @@ Summary:    Trash applet
 Summary(pl.UTF-8):     Aplet śmietnika
 Group:         X11/Applications
 Requires:      %{name} = %{version}-%{release}
+Requires:      glib2 >= 1:2.26.0
+Requires:      gtk+2 >= 2:2.20.0
+Requires:      mate-panel >= 1.5.2
 
 %description -n mate-applet-trash
 The Panel Trash applet lets you manage your Trash from the panel.
@@ -293,161 +339,146 @@ ale jest przydatny o tyle, że panele są zawsze widoczne.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+
+%{__sed} -i -e '1s,/usr/bin/env python,/usr/bin/python,' invest-applet/invest/{invest-applet.py,mate-invest-chart}
 
 %build
-NOCONFIGURE=1 ./autogen.sh
+mate-doc-prepare --copy --force
+%{__intltoolize}
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
        --without-hal \
        --enable-networkmanager \
        --disable-schemas-compile \
        --disable-static
-%{__make} \
-       DOC_MODULE=
+
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%if 1
-rm -rf $RPM_BUILD_ROOT
 %{__make} install \
-       DOC_MODULE= \
        DESTDIR=$RPM_BUILD_ROOT \
        pythondir=%{py_sitedir}
 
 # mate < 1.5 did not exist in pld, avoid dependency on mate-conf
 %{__rm} $RPM_BUILD_ROOT%{_datadir}/MateConf/gsettings/stickynotes-applet.convert
 
-#%{__rm} $RPM_BUILD_ROOT%{_libdir}/libgweather.la
 %{__rm} $RPM_BUILD_ROOT%{py_sitedir}/mate_invest/*.py
 
-# es_ES is more complete copy
-mv -f $RPM_BUILD_ROOT%{_localedir}/es{_ES,}/LC_MESSAGES/*.mo
+# outdated version of es (as of 1.6.1)
 %{__rm} -r $RPM_BUILD_ROOT%{_localedir}/es_ES
 
-# keyboard applet has been removed
-#%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/xmodmap
-%endif
+find_lang_figures() {
+       file="$(pwd)/${1}.lang"
+       shift
+       for glob in $* ; do
+               for f in $(echo $RPM_BUILD_ROOT%{_datadir}/mate/help/*/figures/$glob) ; do
+                       l="$(echo "$f" | sed -e 's,.*%{_datadir}/mate/help/\([^/]\+\)/figures/.*,\1,')"
+                       if [ "$l" = "C" ]; then
+                               echo "${f#$RPM_BUILD_ROOT}"
+                       else
+                               echo "%lang($l) ${f#$RPM_BUILD_ROOT}"
+                       fi
+               done
+       done >>"$file"
+}
 
 rm -f *.lang
 %find_lang %{name}
-cat <<EOF>>%{name}.lang
-%dir %{_datadir}/mate/help/C
-%dir %{_datadir}/mate/help/C/figures
-%dir %{_datadir}/mate/help/ar
-%dir %{_datadir}/mate/help/ar/figures
-%dir %{_datadir}/mate/help/ast
-%dir %{_datadir}/mate/help/ast/figures
-%dir %{_datadir}/mate/help/bg
-%dir %{_datadir}/mate/help/bg/figures
-%dir %{_datadir}/mate/help/ca
-%dir %{_datadir}/mate/help/ca/figures
-%dir %{_datadir}/mate/help/cs
-%dir %{_datadir}/mate/help/cs/figures
-%dir %{_datadir}/mate/help/da
-%dir %{_datadir}/mate/help/da/figures
-%dir %{_datadir}/mate/help/de
-%dir %{_datadir}/mate/help/de/figures
-%dir %{_datadir}/mate/help/el
-%dir %{_datadir}/mate/help/el/figures
-%dir %{_datadir}/mate/help/en_GB
-%dir %{_datadir}/mate/help/en_GB/figures
-%dir %{_datadir}/mate/help/es
-%dir %{_datadir}/mate/help/es/figures
-%dir %{_datadir}/mate/help/eu
-%dir %{_datadir}/mate/help/eu/figures
-%dir %{_datadir}/mate/help/fi
-%dir %{_datadir}/mate/help/fi/figures
-%dir %{_datadir}/mate/help/fr
-%dir %{_datadir}/mate/help/fr/figures
-%dir %{_datadir}/mate/help/gl
-%dir %{_datadir}/mate/help/gl/figures
-%dir %{_datadir}/mate/help/hu
-%dir %{_datadir}/mate/help/hu/figures
-%dir %{_datadir}/mate/help/it
-%dir %{_datadir}/mate/help/it/figures
-%dir %{_datadir}/mate/help/ko
-%dir %{_datadir}/mate/help/ko/figures
-%dir %{_datadir}/mate/help/nl
-%dir %{_datadir}/mate/help/nl/figures
-%dir %{_datadir}/mate/help/oc
-%dir %{_datadir}/mate/help/oc/figures
-%dir %{_datadir}/mate/help/pa
-%dir %{_datadir}/mate/help/pa/figures
-%dir %{_datadir}/mate/help/pt_BR
-%dir %{_datadir}/mate/help/pt_BR/figures
-%dir %{_datadir}/mate/help/ru
-%dir %{_datadir}/mate/help/ru/figures
-%dir %{_datadir}/mate/help/sv
-%dir %{_datadir}/mate/help/sv/figures
-%dir %{_datadir}/mate/help/uk
-%dir %{_datadir}/mate/help/uk/figures
-%dir %{_datadir}/mate/help/zh_CN
-%dir %{_datadir}/mate/help/zh_CN/figures
-%dir %{_datadir}/mate/help/zh_HK
-%dir %{_datadir}/mate/help/zh_HK/figures
-%dir %{_datadir}/mate/help/zh_TW
-%dir %{_datadir}/mate/help/zh_TW/figures
-
-EOF
-#%find_lang accessx-status --with-mate
-cat <<EOF >> accessx-status.lang
-%{_datadir}/mate/help/*/figures/accessx*.png
-EOF
-#%find_lang battstat --with-mate
-cat <<EOF >> battstat.lang
-%{_datadir}/mate/help/*/figures/battstat*.png
-%{_datadir}/mate/help/*/figures/context-menu.png
-EOF
-#%find_lang char-palette --with-mate
-cat <<EOF >> char-palette.lang
-%{_datadir}/mate/help/*/figures/charpalette*.png
-%{_datadir}/mate/help/*/figures/charpick*.png
-EOF
-#%find_lang cpufreq --with-mate
-cat <<EOF >> cpufreq.lang
-%{_datadir}/mate/help/*/figures/cpufreq*.png
-EOF
-#%find_lang drivemount --with-mate
-cat <<EOF >> drivemount.lang
-%{_datadir}/mate/help/*/figures/drivemount*.png
-EOF
-#%find_lang geyes --with-mate
-cat <<EOF >> geyes.lang
-%{_datadir}/mate/help/*/figures/geyes*.png
-EOF
-#%find_lang gweather --with-mate
-cat <<EOF >> gweather.lang
-%{_datadir}/mate/help/*/figures/mateweather*.png
-%{_datadir}/mate/help/*/figures/stock_weather-*.png
-EOF
-#%find_lang invest-applet --with-mate
-cat <<EOF >> invest-applet.lang
-%{_datadir}/mate/help/*/figures/symbol-search.png
-EOF
-#%find_lang mixer_applet2 --with-mate
-touch mixer_applet2.lang
-#%find_lang multiload --with-mate
-cat <<EOF >> multiload.lang
-%{_datadir}/mate/help/*/figures/multiload*.png
-%{_datadir}/mate/help/*/figures/system_monitor.png
-%{_datadir}/mate/help/*/figures/system-monitor-*.png
-EOF
-#%find_lang stickynotes_applet --with-mate
-cat <<EOF >> stickynotes_applet.lang
-%{_datadir}/mate/help/*/figures/stickynote*.png
-EOF
-#%find_lang trashapplet --with-mate
-cat <<EOF >>trashapplet.lang
-%{_datadir}/mate/help/*/figures/trash-applet.png
-EOF
+#cat <<EOF >>%{name}.lang
+#%dir %{_datadir}/mate/help/C
+#%dir %{_datadir}/mate/help/C/figures
+#%lang(ar) %dir %{_datadir}/mate/help/ar
+#%lang(ar) %dir %{_datadir}/mate/help/ar/figures
+#%lang(ast) %dir %{_datadir}/mate/help/ast
+#%lang(ast) %dir %{_datadir}/mate/help/ast/figures
+#%lang(bg) %dir %{_datadir}/mate/help/bg
+#%lang(bg) %dir %{_datadir}/mate/help/bg/figures
+#%lang(ca) %dir %{_datadir}/mate/help/ca
+#%lang(ca) %dir %{_datadir}/mate/help/ca/figures
+#%lang(cs) %dir %{_datadir}/mate/help/cs
+#%lang(cs) %dir %{_datadir}/mate/help/cs/figures
+#%lang(da) %dir %{_datadir}/mate/help/da
+#%lang(da) %dir %{_datadir}/mate/help/da/figures
+#%lang(de) %dir %{_datadir}/mate/help/de
+#%lang(de) %dir %{_datadir}/mate/help/de/figures
+#%lang(el) %dir %{_datadir}/mate/help/el
+#%lang(el) %dir %{_datadir}/mate/help/el/figures
+#%lang(en_GB) %dir %{_datadir}/mate/help/en_GB
+#%lang(en_GB) %dir %{_datadir}/mate/help/en_GB/figures
+#%lang(es) %dir %{_datadir}/mate/help/es
+#%lang(es) %dir %{_datadir}/mate/help/es/figures
+#%lang(eu) %dir %{_datadir}/mate/help/eu
+#%lang(eu) %dir %{_datadir}/mate/help/eu/figures
+#%lang(fi) %dir %{_datadir}/mate/help/fi
+#%lang(fi) %dir %{_datadir}/mate/help/fi/figures
+#%lang(fr) %dir %{_datadir}/mate/help/fr
+#%lang(fr) %dir %{_datadir}/mate/help/fr/figures
+#%lang(gl) %dir %{_datadir}/mate/help/gl
+#%lang(gl) %dir %{_datadir}/mate/help/gl/figures
+#%lang(hu) %dir %{_datadir}/mate/help/hu
+#%lang(hu) %dir %{_datadir}/mate/help/hu/figures
+#%lang(it) %dir %{_datadir}/mate/help/it
+#%lang(it) %dir %{_datadir}/mate/help/it/figures
+#%lang(ko) %dir %{_datadir}/mate/help/ko
+#%lang(ko) %dir %{_datadir}/mate/help/ko/figures
+#%lang(nl) %dir %{_datadir}/mate/help/nl
+#%lang(nl) %dir %{_datadir}/mate/help/nl/figures
+#%lang(oc) %dir %{_datadir}/mate/help/oc
+#%lang(oc) %dir %{_datadir}/mate/help/oc/figures
+#%lang(pa) %dir %{_datadir}/mate/help/pa
+#%lang(pa) %dir %{_datadir}/mate/help/pa/figures
+#%lang(pt_BR) %dir %{_datadir}/mate/help/pt_BR
+#%lang(pt_BR) %dir %{_datadir}/mate/help/pt_BR/figures
+#%lang(ru) %dir %{_datadir}/mate/help/ru
+#%lang(ru) %dir %{_datadir}/mate/help/ru/figures
+#%lang(sv) %dir %{_datadir}/mate/help/sv
+#%lang(sv) %dir %{_datadir}/mate/help/sv/figures
+#%lang(uk) %dir %{_datadir}/mate/help/uk
+#%lang(uk) %dir %{_datadir}/mate/help/uk/figures
+#%lang(zh_CN) %dir %{_datadir}/mate/help/zh_CN
+#%lang(zh_CN) %dir %{_datadir}/mate/help/zh_CN/figures
+#%lang(zh_HK) %dir %{_datadir}/mate/help/zh_HK
+#%lang(zh_HK) %dir %{_datadir}/mate/help/zh_HK/figures
+#%lang(zh_TW) %dir %{_datadir}/mate/help/zh_TW
+#%lang(zh_TW) %dir %{_datadir}/mate/help/zh_TW/figures
+#EOF
+%find_lang mate-accessx-status --with-mate --with-omf
+#find_lang_figures accessx-status accessx*.png
+%find_lang mate-battstat --with-mate --with-omf
+#find_lang_figures battstat battstat*.png context-menu.png
+%find_lang mate-char-palette --with-mate --with-omf
+#find_lang_figures char-palette charpalette*.png charpick*.png
+%find_lang mate-cpufreq-applet --with-mate --with-omf
+#find_lang_figures cpufreq cpufreq*.png
+%find_lang mate-drivemount --with-mate --with-omf
+#find_lang_figures drivemount drivemount*.png
+%find_lang mate-geyes --with-mate --with-omf
+#find_lang_figures geyes geyes*.png
+%find_lang mateweather --with-mate --with-omf
+#find_lang_figures gweather mateweather*.png stock_weather-*.png
+%find_lang mate-invest-applet --with-mate --with-omf
+#find_lang_figures invest-applet symbol-search.png
+%find_lang mate-multiload --with-mate --with-omf
+#find_lang_figures multiload multiload*.png system_monitor.png system-monitor-*.png
+%find_lang mate-stickynotes_applet --with-mate --with-omf
+#find_lang_figures stickynotes_applet stickynote*.png
+%find_lang mate-trashapplet --with-mate --with-omf
+#find_lang_figures trashapplet trash-applet.png
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post -n mate-applet-accessx-status
-%update_icon_cache hicolor
+%update_icon_cache mate
 
 %postun -n mate-applet-accessx-status
-%update_icon_cache hicolor
+%update_icon_cache mate
 
 %post -n mate-applet-battstat
 %glib_compile_schemas
@@ -455,8 +486,6 @@ rm -rf $RPM_BUILD_ROOT
 %preun -n mate-applet-battstat
 %glib_compile_schemas
 
-%postun -n mate-applet-battstat
-
 %post -n mate-applet-charpicker
 %glib_compile_schemas
 %update_icon_cache hicolor
@@ -483,8 +512,6 @@ rm -rf $RPM_BUILD_ROOT
 %preun -n mate-applet-drivemount
 %glib_compile_schemas
 
-%postun -n mate-applet-drivemount
-
 %post -n mate-applet-geyes
 %glib_compile_schemas
 %update_icon_cache hicolor
@@ -495,12 +522,6 @@ rm -rf $RPM_BUILD_ROOT
 %postun -n mate-applet-geyes
 %update_icon_cache hicolor
 
-%post -n mate-applet-gweather
-/sbin/ldconfig
-
-%postun -n mate-applet-gweather
-/sbin/ldconfig
-
 %post -n mate-applet-invest
 %update_icon_cache hicolor
 
@@ -513,8 +534,6 @@ rm -rf $RPM_BUILD_ROOT
 %preun -n mate-applet-multiload
 %glib_compile_schemas
 
-%postun -n mate-applet-multiload
-
 %post -n mate-applet-stickynotes
 %glib_compile_schemas
 %update_icon_cache hicolor
@@ -525,151 +544,121 @@ rm -rf $RPM_BUILD_ROOT
 %postun -n mate-applet-stickynotes
 %update_icon_cache hicolor
 
-%post -n mate-applet-trash
-
-%postun -n mate-applet-trash
-
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/builder
-%lang(es_CL) %dir %{_localedir}/es_CL
-%lang(es_CL) %dir %{_localedir}/es_CL/LC_MESSAGES
-%lang(es_CO) %dir %{_localedir}/es_CO
-%lang(es_CO) %dir %{_localedir}/es_CO/LC_MESSAGES
-%lang(es_CR) %dir %{_localedir}/es_CR
-%lang(es_CR) %dir %{_localedir}/es_CR/LC_MESSAGES
-%lang(es_DO) %dir %{_localedir}/es_DO
-%lang(es_DO) %dir %{_localedir}/es_DO/LC_MESSAGES
-%lang(es_EC) %dir %{_localedir}/es_EC
-%lang(es_EC) %dir %{_localedir}/es_EC/LC_MESSAGES
-%lang(es_GT) %dir %{_localedir}/es_GT
-%lang(es_GT) %dir %{_localedir}/es_GT/LC_MESSAGES
-%lang(es_HN) %dir %{_localedir}/es_HN
-%lang(es_HN) %dir %{_localedir}/es_HN/LC_MESSAGES
-%lang(es_PA) %dir %{_localedir}/es_PA
-%lang(es_PA) %dir %{_localedir}/es_PA/LC_MESSAGES
-%lang(es_PE) %dir %{_localedir}/es_PE
-%lang(es_PE) %dir %{_localedir}/es_PE/LC_MESSAGES
-%lang(es_PR) %dir %{_localedir}/es_PR
-%lang(es_PR) %dir %{_localedir}/es_PR/LC_MESSAGES
-%lang(es_SV) %dir %{_localedir}/es_SV
-%lang(es_SV) %dir %{_localedir}/es_SV/LC_MESSAGES
-%lang(es_UY) %dir %{_localedir}/es_UY
-%lang(es_UY) %dir %{_localedir}/es_UY/LC_MESSAGES
-%lang(es_VE) %dir %{_localedir}/es_VE
-%lang(es_VE) %dir %{_localedir}/es_VE/LC_MESSAGES
-
-%files -n mate-applet-accessx-status -f accessx-status.lang
+
+%files -n mate-applet-accessx-status -f mate-accessx-status.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libexecdir}/accessx-status-applet
 %{_datadir}/dbus-1/services/org.mate.panel.applet.AccessxStatusAppletFactory.service
-%{_datadir}/mate-panel/ui/accessx-status-applet-menu.xml
 %{_datadir}/mate-panel/applets/org.mate.applets.AccessxStatusApplet.mate-panel-applet
+%{_datadir}/mate-panel/ui/accessx-status-applet-menu.xml
 %{_pixmapsdir}/mate-accessx-status-applet
 %{_iconsdir}/mate/*/apps/ax-applet.png
 
-%files -n mate-applet-battstat -f battstat.lang
+%files -n mate-applet-battstat -f mate-battstat.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libexecdir}/battstat-applet-2
+%{_datadir}/%{name}/builder/battstat_applet.ui
 %{_datadir}/dbus-1/services/org.mate.panel.applet.BattstatAppletFactory.service
-%{_datadir}/mate-panel/ui/battstat-applet-menu.xml
 %{_datadir}/mate-panel/applets/org.mate.applets.BattstatApplet.mate-panel-applet
-%{_datadir}/%{name}/builder/battstat_applet.ui
+%{_datadir}/mate-panel/ui/battstat-applet-menu.xml
 %{_datadir}/glib-2.0/schemas/org.mate.panel.applet.battstat.gschema.xml
 # FIXME package not to pull 'balsa'
 %dir %{_sysconfdir}/sound
 %dir %{_sysconfdir}/sound/events
 %{_sysconfdir}/sound/events/mate-battstat_applet.soundlist
 
-%files -n mate-applet-charpicker -f char-palette.lang
+%files -n mate-applet-charpicker -f mate-char-palette.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libexecdir}/charpick_applet2
 %{_datadir}/dbus-1/services/org.mate.panel.applet.CharpickerAppletFactory.service
-%{_datadir}/mate-panel/ui/charpick-applet-menu.xml
-%{_datadir}/mate-panel/applets/org.mate.applets.CharpickerApplet.mate-panel-applet
 %{_datadir}/glib-2.0/schemas/org.mate.panel.applet.charpick.gschema.xml
+%{_datadir}/mate-panel/applets/org.mate.applets.CharpickerApplet.mate-panel-applet
+%{_datadir}/mate-panel/ui/charpick-applet-menu.xml
 
-%files -n mate-applet-cpufreq -f cpufreq.lang
+%files -n mate-applet-cpufreq -f mate-cpufreq-applet.lang
 %defattr(644,root,root,755)
+# selector
 %attr(755,root,root) %{_bindir}/mate-cpufreq-selector
-%attr(755,root,root) %{_libexecdir}/mate-cpufreq-applet
-%{_datadir}/dbus-1/services/org.mate.panel.applet.CPUFreqAppletFactory.service
-%{_datadir}/glib-2.0/schemas/org.mate.panel.applet.cpufreq.gschema.xml
-%if 1
 /etc/dbus-1/system.d/org.mate.CPUFreqSelector.conf
 %{_datadir}/dbus-1/system-services/org.mate.CPUFreqSelector.service
 %{_datadir}/polkit-1/actions/org.mate.cpufreqselector.policy
-%endif
-%{_datadir}/mate-panel/applets/org.mate.applets.CPUFreqApplet.mate-panel-applet
+# applet itself
+%attr(755,root,root) %{_libexecdir}/mate-cpufreq-applet
 %{_datadir}/%{name}/builder/cpufreq-preferences.ui
+%{_datadir}/dbus-1/services/org.mate.panel.applet.CPUFreqAppletFactory.service
+%{_datadir}/glib-2.0/schemas/org.mate.panel.applet.cpufreq.gschema.xml
+%{_datadir}/mate-panel/applets/org.mate.applets.CPUFreqApplet.mate-panel-applet
 %{_datadir}/mate-panel/ui/cpufreq-applet-menu.xml
 %{_pixmapsdir}/mate-cpufreq-applet
 %{_iconsdir}/hicolor/*/apps/mate-cpu-frequency-applet.png
 %{_iconsdir}/hicolor/*/apps/mate-cpu-frequency-applet.svg
 
-%files -n mate-applet-drivemount -f drivemount.lang
+%files -n mate-applet-drivemount -f mate-drivemount.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libexecdir}/drivemount_applet2
 %{_datadir}/dbus-1/services/org.mate.panel.applet.DriveMountAppletFactory.service
-%{_datadir}/mate-panel/ui/drivemount-applet-menu.xml
 %{_datadir}/mate-panel/applets/org.mate.applets.DriveMountApplet.mate-panel-applet
+%{_datadir}/mate-panel/ui/drivemount-applet-menu.xml
 
-%files -n mate-applet-geyes -f geyes.lang
+%files -n mate-applet-geyes -f mate-geyes.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libexecdir}/geyes_applet2
-%{_datadir}/dbus-1/services/org.mate.panel.applet.GeyesAppletFactory.service
-%{_datadir}/mate-panel/ui/geyes-applet-menu.xml
 %{_datadir}/%{name}/geyes
+%{_datadir}/dbus-1/services/org.mate.panel.applet.GeyesAppletFactory.service
+%{_datadir}/glib-2.0/schemas/org.mate.panel.applet.geyes.gschema.xml
 %{_datadir}/mate-panel/applets/org.mate.applets.GeyesApplet.mate-panel-applet
+%{_datadir}/mate-panel/ui/geyes-applet-menu.xml
 %{_iconsdir}/hicolor/*/apps/mate-eyes-applet.*
-%{_datadir}/glib-2.0/schemas/org.mate.panel.applet.geyes.gschema.xml
 
-%files -n mate-applet-gweather -f gweather.lang
+%files -n mate-applet-gweather -f mateweather.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libexecdir}/mateweather-applet-2
 %{_datadir}/dbus-1/services/org.mate.panel.applet.MateWeatherAppletFactory.service
-%{_datadir}/mate-panel/ui/mateweather-applet-menu.xml
 %{_datadir}/mate-panel/applets/org.mate.applets.MateWeatherApplet.mate-panel-applet
+%{_datadir}/mate-panel/ui/mateweather-applet-menu.xml
 
-%files -n mate-applet-invest -f invest-applet.lang
+%files -n mate-applet-invest -f mate-invest-applet.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/mate-invest-chart
 %attr(755,root,root) %{_libexecdir}/invest-applet
-%{_datadir}/dbus-1/services/org.mate.panel.applet.InvestAppletFactory.service
 %{_datadir}/%{name}/Invest_Applet.xml
-%{_datadir}/mate-panel/applets/org.mate.applets.InvestApplet.mate-panel-applet
+%{_datadir}/%{name}/invest-applet
 %{_datadir}/%{name}/builder/financialchart.ui
 %{_datadir}/%{name}/builder/prefs-dialog.ui
-%{_datadir}/%{name}/invest-applet
+%{_datadir}/dbus-1/services/org.mate.panel.applet.InvestAppletFactory.service
+%{_datadir}/mate-panel/applets/org.mate.applets.InvestApplet.mate-panel-applet
 %{_iconsdir}/hicolor/*/apps/mate-invest-applet.*
 %dir %{py_sitedir}/mate_invest
 %{py_sitedir}/mate_invest/*.py[co]
 
-%files -n mate-applet-multiload -f multiload.lang
+%files -n mate-applet-multiload -f mate-multiload.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libexecdir}/multiload-applet-2
 %{_datadir}/dbus-1/services/org.mate.panel.applet.MultiLoadAppletFactory.service
+%{_datadir}/glib-2.0/schemas/org.mate.panel.applet.multiload.gschema.xml
 %{_datadir}/mate-panel/ui/multiload-applet-menu.xml
 %{_datadir}/mate-panel/applets/org.mate.applets.MultiLoadApplet.mate-panel-applet
-%{_datadir}/glib-2.0/schemas/org.mate.panel.applet.multiload.gschema.xml
 
-%files -n mate-applet-stickynotes -f stickynotes_applet.lang
+%files -n mate-applet-stickynotes -f mate-stickynotes_applet.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libexecdir}/stickynotes_applet
-%{_datadir}/dbus-1/services/org.mate.panel.applet.StickyNotesAppletFactory.service
-%{_datadir}/mate-panel/ui/stickynotes-applet-menu.xml
 %{_datadir}/%{name}/builder/stickynotes.ui
+%{_datadir}/dbus-1/services/org.mate.panel.applet.StickyNotesAppletFactory.service
+%{_datadir}/glib-2.0/schemas/org.mate.stickynotes.gschema.xml
 %{_datadir}/mate-panel/applets/org.mate.applets.StickyNotesApplet.mate-panel-applet
+%{_datadir}/mate-panel/ui/stickynotes-applet-menu.xml
 %{_pixmapsdir}/mate-stickynotes
 %{_iconsdir}/hicolor/*/apps/mate-sticky-notes-applet.*
-%{_datadir}/glib-2.0/schemas/org.mate.stickynotes.gschema.xml
 
-%files -n mate-applet-trash -f trashapplet.lang
+%files -n mate-applet-trash -f mate-trashapplet.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libexecdir}/trashapplet
-%{_datadir}/dbus-1/services/org.mate.panel.applet.TrashAppletFactory.service
 %{_datadir}/%{name}/builder/trashapplet-empty-progress.ui
-%{_datadir}/mate-panel/ui/trashapplet-menu.xml
+%{_datadir}/dbus-1/services/org.mate.panel.applet.TrashAppletFactory.service
 %{_datadir}/mate-panel/applets/org.mate.applets.TrashApplet.mate-panel-applet
+%{_datadir}/mate-panel/ui/trashapplet-menu.xml