X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gnome-applets.spec;h=bcfb9f0fa2f4c6d854d657a50cf712a289f496bb;hb=cc89d257f79ce3625f08b8c858042449bebec260;hp=3b21dfafbe32fe144cc0872347f9915e53523cbd;hpb=e6e2f00344504f4e63ae76cd3772386b183a3fd1;p=packages%2Fgnome-applets.git

diff --git a/gnome-applets.spec b/gnome-applets.spec
index 3b21dfa..bcfb9f0 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -1,375 +1,567 @@
-#
-# Conditional build:
-%bcond_without	modemlights	# don't build modemlights applet
-#
+%define	glib2_ver	1:2.44.0
+%define	gtk3_ver	3.20.0
 Summary:	Small applications which embed themselves in the GNOME panel
-Summary(pl):	Aplety GNOME - ma³e aplikacje osadzaj±ce siê w panelu
-Summary(ru):	íÁÌÅÎØËÉÅ ÐÒÏÇÒÁÍÍÙ, ×ÓÔÒÁÉ×ÁÀÝÉÅÓÑ × ÐÁÎÅÌØ GNOME
-Summary(uk):	íÁÌÅÎØ˦ ÐÒÏÇÒÁÍÉ, ÝÏ ×ÂÕÄÏ×ÕÀÔØÓÑ × ÐÁÎÅÌØ GNOME
+Summary(pl.UTF-8):	Aplety GNOME - małe aplikacje osadzające się w panelu
+Summary(ru.UTF-8):	Маленькие программы, встраивающиеся в панель GNOME
+Summary(uk.UTF-8):	Маленькі програми, що вбудовуються в панель GNOME
 Name:		gnome-applets
-Version:	2.16.0.1
+Version:	3.24.1
 Release:	1
 Epoch:		1
-License:	GPL v2, FDL
+License:	GPL v2+, FDL
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/gnome/sources/gnome-applets/2.16/%{name}-%{version}.tar.bz2
-# Source0-md5:	ff31b5b0a4bf5d0a9f8d0039133f2333
-Patch0:		%{name}-stickynotes-title-size.patch
-Patch1:		%{name}-m4_fix.patch
-Patch2:		%{name}-desktop.patch
-Patch3:		%{name}-modemlights-conditional.patch
-URL:		http://www.gnome.org/
-BuildRequires:	GConf2-devel >= 2.14.0
-BuildRequires:	autoconf
-BuildRequires:	automake
-BuildRequires:	control-center-devel >= 2.16.0
-BuildRequires:	cpufrequtils-devel >= 0.3
-BuildRequires:	dbus-glib-devel >= 0.71-2
-BuildRequires:	gail-devel >= 1.9.2
-BuildRequires:	gdbm-devel
-BuildRequires:	gettext-devel
-BuildRequires:	gnome-common >= 2.12.0
-BuildRequires:	gnome-desktop-devel >= 2.16.0
-BuildRequires:	gnome-doc-utils >= 0.7.2
-BuildRequires:	gnome-panel-devel >= 2.16.0
-BuildRequires:	gnome-vfs2-devel >= 2.16.0
-BuildRequires:	gstreamer-plugins-base-devel >= 0.10.9
-BuildRequires:	gtk+2-devel >= 2:2.10.3
-BuildRequires:	gucharmap-devel >= 1.8.0
-BuildRequires:	hal-devel >= 0.5.7.1
-BuildRequires:	intltool >= 0.35.0
-BuildRequires:	libgnomeui-devel >= 2.16.0
-BuildRequires:	libglade2-devel >= 1:2.6.0
-BuildRequires:	libgtop-devel >= 1:2.14.3
-BuildRequires:	libnotify-devel >= 0.4.2
-BuildRequires:	libtool
-BuildRequires:	libwnck-devel >= 2.16.0
-BuildRequires:	libxml2-devel >= 1:2.6.26
-BuildRequires:	libxklavier-devel >= 3.0
-BuildRequires:	libxslt-progs >= 1.1.17
-BuildRequires:	pkgconfig
-BuildRequires:	python-gnome-desktop-devel >= 2.16.0
-BuildRequires:	rpmbuild(macros) >= 1.197
-BuildRequires:	scrollkeeper >= 0.3.11-4
-%if %{with modemlights}
-BuildRequires:	system-tools-backends >= 1.4.0
-BuildRequires:	system-tools-backends < 1.9.0
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-applets/3.24/%{name}-%{version}.tar.xz
+# Source0-md5:	1315a92044feddd4067b9f0e562c8da9
+URL:		https://wiki.gnome.org/Projects/GnomeApplets
+BuildRequires:	adwaita-icon-theme >= 3.14.0
+%ifarch %{ix86} %{arm} mips ppc sh
+BuildRequires:	apmd-devel
 %endif
-Requires:	gnome-icon-theme >= 2.16.0.1
-Requires:	gnome-panel >= 2.16.0
-Requires:	gnome-vfs2 >= 2.16.0
-Requires:	hicolor-icon-theme
-Requires:	libgnomeui >= 2.16.0
+BuildRequires:	autoconf >= 2.59
+BuildRequires:	automake >= 1:1.13
+BuildRequires:	dbus-devel >= 1.1.2
+BuildRequires:	dbus-glib-devel >= 0.74
+BuildRequires:	docbook-dtd412-xml
+BuildRequires:	docbook-dtd43-xml
+BuildRequires:	docbook-utils
+BuildRequires:	gdk-pixbuf2-devel >= 2
+BuildRequires:	gettext-tools
+BuildRequires:	glib2-devel >= %{glib2_ver}
+BuildRequires:	gnome-common >= 2.24.0
+BuildRequires:	gnome-panel-devel >= 3.24.1
+BuildRequires:	gnome-settings-daemon-devel >= 3.0.0
+BuildRequires:	gtk+3-devel >= %{gtk3_ver}
+BuildRequires:	gucharmap-devel >= 3.2.1
+BuildRequires:	intltool >= 0.40.0
+BuildRequires:	kernel-tools-cpupower-libs-devel
+BuildRequires:	libgtop-devel >= 1:2.22.0
+BuildRequires:	libgweather-devel >= 3.17.1
+BuildRequires:	libiw-devel >= 28
+BuildRequires:	libnotify-devel >= 0.7
+BuildRequires:	libtool >= 2:2
+BuildRequires:	libwnck-devel >= 3.14.1
+BuildRequires:	libxml2-devel >= 1:2.6.30
+BuildRequires:	libxslt-progs >= 1.1.20
+BuildRequires:	pkgconfig >= 1:0.19
+BuildRequires:	polkit-devel >= 0.97
+BuildRequires:	rpmbuild(find_lang) >= 1.23
+BuildRequires:	rpmbuild(macros) >= 1.311
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	tracker-devel >= 1.0
+BuildRequires:	upower-devel >= 0.9.4
+BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	xz
+BuildRequires:	yelp-tools
+Requires:	adwaita-icon-theme >= 3.14.0
+Requires:	gnome-panel >= 3.24.1
+Obsoletes:	gnome-applets-keyboard
+Obsoletes:	gnome-applets-mixer
+# sr@Latn vs. sr@latin
+Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_gnomehelpdir	%{_datadir}/gnome/help
-
 %description
 The gnome-applets package provides Panel applets which enhance your
 GNOME experience.
 
-%description -l pl
-Pakiet gnome-applets udostêpnia aplety Panelu, które usprawniaj± pracê
+%description -l pl.UTF-8
+Pakiet gnome-applets udostępnia aplety Panelu, które usprawniają pracę
 z GNOME.
 
-%description -l uk
-ðÁËÅÔ gnome-applets ͦÓÔÉÔØ ÁÐÌÅÔÉ ðÁÎÅ̦ GNOME, ÝÏ Ú¦ÌØÛÕÀÔØ
-ËÏÍÆÏÒÔΦÓÔØ ÒÏÂÏÔÉ × ÓÅÒÅÄÏ×Éݦ GNOME.
-
-%description -l ru
-ðÁËÅÔ gnome-applets ÓÏÄÅÒÖÉÔ ÁÐÐÌÅÔÙ ðÁÎÅÌÉ GNOME, Õ×ÅÌÉÞÉ×ÁÀÝÉÅ
-ËÏÍÆÏÒÔÎÏÓÔØ ÒÁÂÏÔÙ × ÓÒÅÄÅ GNOME.
-
-%package devel
-Summary:	Header files for gnome-applets
-Summary(pl):	Pliki nag³ówkowe gnome-applets
-Group:		Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	GConf2-devel >= 2.14.0
-Requires:	gtk+2-devel >= 2:2.10.3
-
-%description devel
-Header files for gnome-applets.
+%description -l uk.UTF-8
+Пакет gnome-applets містить аплети Панелі GNOME, що збільшують
+комфортність роботи в середовищі GNOME.
 
-%description devel -l pl
-Pliki nag³ówkowe gnome-applets.
+%description -l ru.UTF-8
+Пакет gnome-applets содержит апплеты Панели GNOME, увеличивающие
+комфортность работы в среде GNOME.
 
 %package accessx-status
 Summary:	Keyboard Accessibility Status applet
-Summary(pl):	Aplet stanu dostepno¶ci klawiatury
+Summary(pl.UTF-8):	Aplet stanu dostepności klawiatury
 Group:		X11/Applications
-Requires(post,postun):	gtk+2 >= 2.10.3
-Requires(post,postun):	scrollkeeper
+URL:		https://help.gnome.org/users/accessx-status/stable/
+Requires(post,postun):	gtk-update-icon-cache
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Conflicts:	gnome-applets <= 0:2.10.0-5
+Requires:	glib2 >= %{glib2_ver}
+Requires:	gtk+3 >= %{gtk3_ver}
+Requires:	hicolor-icon-theme
+Suggests:	gnome-control-center >= 2.26.0
 
 %description accessx-status
-Keyboard Accessibility Status applet.
+The Keyboard Accessibility Monitor shows you the status of the
+keyboard accessibility features when these are in use. For example,
+you can see which modifier keys are currently active, and which mouse
+buttons are being pressed via the keyboard.
 
-%description accessx-status -l pl
-Aplet stanu dostepno¶ci klawiatury.
+%description accessx-status -l pl.UTF-8
+Aplet monitora dostępności klawiatury pokazuje stan funkcji
+zwiększających dostępność klawiatury, kiedy są włączone. Pozwala
+zobaczyć m.in. które klawisze modyfikatorów są aktywne albo które
+przyciski myszy są wciskane z poziomu klawiatury.
 
 %package battstat
 Summary:	Battery Charge Monitor applet
-Summary(pl):	Aplet monitora stanu na³adowania akumulatora
+Summary(pl.UTF-8):	Aplet monitora stanu naładowania akumulatora
 Group:		X11/Applications
-Requires(post,preun):	GConf2
-Requires(post,postun):	scrollkeeper
+URL:		https://help.gnome.org/users/battstat/stable/
+Requires(post,postun):	glib2 >= %{glib2_ver}
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Conflicts:	gnome-applets <= 0:2.10.0-5
+Requires:	glib2 >= %{glib2_ver}
+Requires:	gtk+3 >= %{gtk3_ver}
+Requires:	libnotify >= 0.7
+Requires:	upower >= 0.9.4
 
 %description battstat
-Battery Charge Monitor applet.
+The Battery Charge Monitor shows the status of any batteries in your
+laptop computer. The monitor can tell you the capacity remaining both
+visually and as a percentage, as well as offer you an estimate of the
+time remaining based off the current usage rate.
+
+%description battstat -l pl.UTF-8
+Aplet monitora stanu naładowania akumulatora pokazuje stan wszelkich
+baterii w laptopie. Monitor informuje o pozostałej pojemności zarówno
+w postaci graficznej, jak i procentowej, a także podaje przybliżony
+pozostały czas pracy przy założeniu bieżącego użycia prądu.
+
+%package brightness
+Summary:	Brightness applet
+Summary(pl.UTF-8):	Aplet jasności
+Group:		X11/Applications
+Requires(post,postun):	gtk-update-icon-cache
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	glib2 >= %{glib2_ver}
+Requires:	gtk+3 >= %{gtk3_ver}
+Requires:	hicolor-icon-theme
 
-%description battstat -l pl
-Aplet monitora stanu na³adowania akumulatora.
+%description brightness
+Brightness applet adjusts laptop panel brightness.
+
+%description brightness -l pl.UTF-8
+Aplet jasności dopasowuje jasność wyświetlacza laptopa.
 
 %package charpicker
 Summary:	Character Palette applet
-Summary(pl):	Aplet palety znaków
+Summary(pl.UTF-8):	Aplet palety znaków
 Group:		X11/Applications
-Requires(post,preun):	GConf2
-Requires(post,postun):	gtk+2 >= 2.10.3
-Requires(post,postun):	scrollkeeper
+URL:		https://help.gnome.org/users/char-palette/stable/
+Requires(post,postun):	glib2 >= %{glib2_ver}
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Conflicts:	gnome-applets <= 0:2.10.0-5
+Requires:	glib2 >= %{glib2_ver}
+Requires:	gtk+3 >= %{gtk3_ver}
+Requires:	gucharmap >= 3.2.1
 
 %description charpicker
-Character Palette applet.
+The Character Palette provides a convenient way to access characters
+that are not on your keyboard, such as accented characters,
+mathematical symbols, special symbols, and punctuation marks.
+
+You can insert characters from the applet into text strings, for
+example in text documents or at the command line. You can customize
+the contents of the applet to suit your requirements.
 
-%description charpicker -l pl
-Aplet palety znaków.
+Character Palette supports the UTF-8 character encoding so you can use
+the palette to display or copy any Unicode character.
+
+%description charpicker -l pl.UTF-8
+Aplet palety znaków udostępnia wygodną metodę wprowadzania znaków nie
+istniejących na klawiaturze, takich jak znaki akcentowane, symbole
+matematyczne, symbole specjalne i znaki przestankowe.
+
+Przy pomocy apletu można wprowadzać znaki do łańcuchów tekstowych, na
+przykład w dokumentach tekstowych lub w linii poleceń. Zawartość
+apletu można dostosowywać do własnych wymagań.
+
+Paleta znaków obsługuje kodowanie znaków UTF-8, więc można jej używać
+do wyświetlania lub kopiowania dowolnych znaków unikodowych.
+
+%package command
+Summary:	Command applet - show the output of a command
+Summary(pl.UTF-8):	Aplet polecenia, pokazujący wyjście z polecenia
+Group:		X11/Applications
+Requires(post,postun):	glib2 >= %{glib2_ver}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	glib2 >= %{glib2_ver}
+Requires:	gtk+3 >= %{gtk3_ver}
+
+%description command
+Command applet shows the output of a command.
+
+%description command -l pl.UTF-8
+Aplet polecenia pokazuje wyjście z podanego polecenia.
 
 %package cpufreq
 Summary:	CPU Frequency Scaling Monitor applet
-Summary(pl):	Aplet monitora czêstotliwo¶ci procesora
+Summary(pl.UTF-8):	Aplet monitora częstotliwości procesora
 Group:		X11/Applications
-Requires(post,preun):	GConf2
-Requires(post,postun):	gtk+2 >= 2.10.3
-Requires(post,postun):	scrollkeeper
+URL:		https://help.gnome.org/users/cpufreq-applet/stable/
+Requires(post,postun):	glib2 >= %{glib2_ver}
+Requires(post,postun):	gtk-update-icon-cache
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Conflicts:	gnome-applets <= 0:2.10.0-5
+Requires:	dbus-glib >= 0.74
+Requires:	glib2 >= %{glib2_ver}
+Requires:	gtk+3 >= %{gtk3_ver}
+Requires:	hicolor-icon-theme
+Requires:	polkit >= 0.97
 Obsoletes:	gnome-applet-cpufreq
 
 %description cpufreq
-CPU Frequency Scaling Monitor applet.
+The CPU Frequency Scaling Monitor provides a convenient way to monitor
+the CPU Frequency Scaling for each CPU.
 
-%description cpufreq -l pl
-Aplet monitora czêstotliwo¶ci procesora.
+%description cpufreq -l pl.UTF-8
+Aplet monitora częstotliwości procesora umożliwia wygodne
+monitorowanie częstotliwości dla każdego procesora.
 
 %package drivemount
 Summary:	Disk Mounter applet
-Summary(pl):	Aplet do montowania dysków
+Summary(pl.UTF-8):	Aplet do montowania dysków
 Group:		X11/Applications
-Requires(post,preun):	GConf2
-Requires(post,postun):	scrollkeeper
+URL:		https://help.gnome.org/users/drivemount/stable/
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Conflicts:	gnome-applets <= 0:2.10.0-5
+Requires:	glib2 >= %{glib2_ver}
+Requires:	gtk+3 >= %{gtk3_ver}
 
 %description drivemount
-Disk Mounter applet.
+The Disk Mounter enables you to quickly mount and unmount various
+types of drives and file systems.
 
-%description drivemount -l pl
-Aplet do monotwania dysków.
+%description drivemount -l pl.UTF-8
+Aplet do montowania dysków, pozwalający szybko montować i odmontowywać
+różne rodzaje dysków i systemów plików.
 
 %package geyes
-Summary:	Geyes applet
-Summary(pl):	Aplet geyes
+Summary:	Geyes applet - tracking the mouse pointer
+Summary(pl.UTF-8):	Aplet geyes - śledzenie wskaźnika myszy
 Group:		X11/Applications
-Requires(post,preun):	GConf2
-Requires(post,postun):	gtk+2 >= 2.10.3
-Requires(post,postun):	scrollkeeper
+URL:		https://help.gnome.org/users/geyes/stable/
+Requires(post,postun):	glib2 >= %{glib2_ver}
+Requires(post,postun):	gtk-update-icon-cache
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Conflicts:	gnome-applets <= 0:2.10.0-5
+Requires:	glib2 >= %{glib2_ver}
+Requires:	gtk+3 >= %{gtk3_ver}
+Requires:	hicolor-icon-theme
 
 %description geyes
-Geyes applet.
+The Geyes applet provides an entertaining way to track the movement of
+the mouse pointer around your screen. The applet is an image of one or
+more eyes that follow the mouse pointer around the screen.
 
-%description geyes -l pl
-Aplet geyes.
+%description geyes -l pl.UTF-8
+Aplet geyes to zabawny sposób śledzenia ruchu wskaźnika myszy po
+ekranie. Aplet jest obrazem jednego lub większej liczby oczu
+podążających za wskaźnikiem myszy.
 
 %package gweather
 Summary:	Weather Report applet
-Summary(pl):	Aplet raportu pogodowego
+Summary(pl.UTF-8):	Aplet raportu pogodowego
 Group:		X11/Applications
-Requires(post,preun):	GConf2
-Requires(post,postun):	scrollkeeper
+URL:		https://help.gnome.org/users/gweather/stable/
+Requires(post,postun):	glib2 >= %{glib2_ver}
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	notification-daemon
-Conflicts:	gnome-applets <= 0:2.10.0-5
+Requires:	dbus(org.freedesktop.Notifications)
+Requires:	glib2 >= %{glib2_ver}
+Requires:	gtk+3 >= %{gtk3_ver}
+Requires:	libgweather >= 3.17.1
+Requires:	libnotify >= 0.7
 
 %description gweather
-Weather Report applet.
+The Weather Report downloads weather information from the U.S.
+National Weather Service (NWS) servers, including the Interactive
+Weather Information Network (IWIN) and other weather services. You can
+use Weather Report to display current weather information and weather
+forecasts on your computer.
+
+%description gweather -l pl.UTF-8
+Aplet raportu pogodowego ściąga informacje pogodowe z serwerów U.S.
+National Weather Service (NWS), wraz z siecią Interactive Weather
+Information Network (IWIN) oraz innych serwisów pogodowych. Apletu
+można używać do wyświetlania aktualnych informacji pogodowych oraz
+prognoz.
+
+%package inhibit
+Summary:	Inhibit applet
+Summary(pl.UTF-8):	Aplet wyłączania
+Group:		X11/Applications
+Requires(post,postun):	gtk-update-icon-cache
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	glib2 >= %{glib2_ver}
+Requires:	gtk+3 >= %{gtk3_ver}
+Requires:	hicolor-icon-theme
+
+%description inhibit
+Inhibit applet allows user to inhibit automatic power saving.
 
-%description gweather -l pl
-Aplet raportu pogodowego.
+%description inhibit -l pl.UTF-8
+Aplet wyłączania pozwala użytkownikowi na wyłączenie automatycznego
+oszczędzania zasilania.
 
 %package invest
 Summary:	Stock Ticker applet
-Summary(pl):	Aplet wska¼nika gie³dowego
+Summary(pl.UTF-8):	Aplet wskaźnika giełdowego
 Group:		X11/Applications
-Requires(post,preun):	GConf2
-Requires(post,postun):	scrollkeeper
+URL:		https://help.gnome.org/users/invest-applet/stable/
+Requires(post,postun):	gtk-update-icon-cache
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	python-gnome-extras-egg >= 2.14.2
-Conflicts:	gnome-applets <= 0:2.10.0-5
+Requires:	glib2 >= %{glib2_ver}
+Requires:	gobject-introspection
+Requires:	gtk+3 >= %{gtk3_ver}
+Requires:	hicolor-icon-theme
 Obsoletes:	gnome-applets-gtik
 
 %description invest
-Stock Ticker applet.
-
-%description invest -l pl
-Aplet wska¼nika gie³dowego.
-
-%package keyboard
-Summary:	Keyboard Indicator applet
-Summary(pl):	Aplet wska¼nika klawiatury
-Group:		X11/Applications
-Requires(post,preun):	GConf2
-Requires(post,postun):	gtk+2 >= 2.10.3
-Requires(post,postun):	scrollkeeper
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-Conflicts:	gnome-applets <= 0:2.10.0-5
+The Invest GNOME panel applet downloads current stock quotes from
+Yahoo! Finance and displays the quotes in a drop-down list.
 
-%description keyboard
-Keyboard Indicator applet.
-
-%description keyboard -l pl
-Aplet wska¼nika klawiatury.
+%description invest -l pl.UTF-8
+Aplet wskaźnika giełdowego, ściągający aktualne notowania z serwisu
+Yahoo! Finance i wyświetlające je na rozwijanej liście.
 
 %package minicommander
 Summary:	Command Line applet
-Summary(pl):	Aplet wiersza poleceñ
+Summary(pl.UTF-8):	Aplet wiersza poleceń
 Group:		X11/Applications
-Requires(post,preun):	GConf2
-Requires(post,postun):	scrollkeeper
+URL:		https://help.gnome.org/users/command-line/stable/
+Requires(post,postun):	glib2 >= %{glib2_ver}
+Requires(post,postun):	gtk-update-icon-cache
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Conflicts:	gnome-applets <= 0:2.10.0-5
+Requires:	glib2 >= %{glib2_ver}
+Requires:	gtk+3 >= %{gtk3_ver}
+Requires:	hicolor-icon-theme
 
 %description minicommander
-Command Line applet.
-
-%description minicommander -l pl
-Aplet wiersza poleceñ.
-
-%package mixer
-Summary:	Volume Control applet
-Summary(pl):	Aplet regulacji g³o¶no¶ci
-Group:		X11/Applications
-Requires(post,preun):	GConf2
-Requires(post,postun):	gtk+2 >= 2.10.3
-Requires(post,postun):	scrollkeeper
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	gstreamer-audio-effects-base >= 0.10
-Requires:	gstreamer-audiosink
-Conflicts:	gnome-applets <= 0:2.10.0-5
+The Command Line provides a command line that you can use within any
+panel on the desktop.
 
-%description mixer
-Volume Control applet.
-
-%description mixer -l pl
-Aplet regulacji g³o¶no¶ci.
+%description minicommander -l pl.UTF-8
+Aplet wiersza poleceń udostępnia linię poleceń z poziomu każdego
+panelu na pulpicie.
 
 %package modemlights
 Summary:	Modem Lights applet
-Summary(pl):	Aplet kontrolek modemu
+Summary(pl.UTF-8):	Aplet kontrolek modemu
 Group:		X11/Applications
-Requires(post,postun):	gtk+2 >= 2.10.3
+Requires(post,postun):	gtk-update-icon-cache
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	system-tools-backends >= 1.4.0
-Requires:	system-tools-backends < 1.9.0
-Conflicts:	gnome-applets <= 0:2.10.0-5
+Requires:	glib2 >= %{glib2_ver}
+Requires:	gtk+3 >= %{gtk3_ver}
+Requires:	hicolor-icon-theme
+Requires:	libxml2 >= 1:2.6.30
 
 %description modemlights
 Modem Lights applet.
 
-%description modemlights -l pl
+%description modemlights -l pl.UTF-8
 Aplet kontrolek modemu.
 
 %package multiload
 Summary:	System Monitor applet
-Summary(pl):	Aplet monitora systemu
+Summary(pl.UTF-8):	Aplet monitora systemu
 Group:		X11/Applications
-Requires(post,preun):	GConf2
-Requires(post,postun):	scrollkeeper
+URL:		https://help.gnome.org/users/multiload/stable/
+Requires(post,postun):	glib2 >= %{glib2_ver}
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Conflicts:	gnome-applets <= 0:2.10.0-5
+Requires:	glib2 >= %{glib2_ver}
+Requires:	gtk+3 >= %{gtk3_ver}
+Requires:	libgtop >= 1:2.22.0
+Suggests:	gnome-system-monitor >= 2.24.0
 
 %description multiload
-System Monitor applet.
+The System Monitor displays system load information in graphical
+format in a panel.
+
+%description multiload -l pl.UTF-8
+Aplet monitora systemu wyświetla w panelu informacje o obciążeniu
+systemu w postaci graficznej.
+
+%package netspeed
+Summary:	Applet to show how much traffic occurs on a network device
+Summary(pl.UTF-8):	Aplet pokazujący wielkość ruchu występującego na urządzeniu sieciowym
+Group:		X11/Applications
+Requires(post,postun):	glib2 >= %{glib2_ver}
+Requires(post,postun):	gtk-update-icon-cache
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	glib2 >= %{glib2_ver}
+Requires:	gtk+3 >= %{gtk3_ver}
+Requires:	hicolor-icon-theme
+Requires:	libiw >= 28
+Obsoletes:	gnome-applet-netspeed
+
+%description netspeed
+Netspeed applet is just a little applet that shows how much traffic
+occurs on a specified network device.
+
+%description netspeed -l pl.UTF-8
+Netspeed to mały aplet pokazujący, jak duży ruch występuje na
+określonym urządzeniu sieciowym.
 
-%description multiload -l pl
-Aplet monitora systemu.
+%package search
+Summary:	Tracker Search Bar
+Summary(pl.UTF-8):	Pasek wyszukiwania Tracker
+Group:		X11/Applications
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	glib2 >= %{glib2_ver}
+Requires:	gtk+3 >= %{gtk3_ver}
+Requires:	tracker >= 1.0
+
+%description search
+Tracker Search Bar allows to find your data quickly using Tracker.
+
+%description search -l pl.UTF-8
+Pasek wyszukiwania pozwala na szybkie wyszukiwanie danych za pomocą
+usługi Tracker.
 
 %package stickynotes
 Summary:	Sticky Notes applet
-Summary(pl):	Aplet notatek
+Summary(pl.UTF-8):	Aplet notatek
 Group:		X11/Applications
-Requires(post,preun):	GConf2
-Requires(post,postun):	gtk+2 >= 2.10.3
-Requires(post,postun):	scrollkeeper
+URL:		https://help.gnome.org/users/stickynotes_applet/stable/
+Requires(post,postun):	glib2 >= %{glib2_ver}
+Requires(post,postun):	gtk-update-icon-cache
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Conflicts:	gnome-applets <= 0:2.10.0-5
+Requires:	glib2 >= %{glib2_ver}
+Requires:	gtk+3 >= %{gtk3_ver}
+Requires:	hicolor-icon-theme
+Requires:	libwnck >= 3.14.1
+Requires:	libxml2 >= 1:2.6.30
 Obsoletes:	gnotes_applet
 
 %description stickynotes
-Sticky Notes applet.
+The Sticky Notes panel application enables you to create, view, and
+manage sticky notes on your desktop. You can edit the title, contents,
+dimensions, and style of sticky notes. When the panel is restarted,
+for example when you log out and log in again, all sticky notes are
+saved and reopened in the same position with the same dimensions and
+style.
+
+%description stickynotes -l pl.UTF-8
+Aplet notatek pozwala na tworzenie, oglądanie i zarządzanie
+przyczepianymi notatkami na pulpicie. Pozwala modyfikować tytuł,
+treść, wymiary i styl notatek. Przy restarcie panelu, na przykład przy
+wylogowaniu i ponownym zalogowaniu, wszystkie notatki są zapisywane, a
+następnie otwierane ponownie w tym samym miejscu, z tymi samymi
+wymiarami i stylem.
+
+%package timer
+Summary:	Timer applet
+Summary(pl.UTF-8):	Aplet minutnika
+Group:		X11/Applications
+Requires(post,postun):	glib2 >= %{glib2_ver}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	glib2 >= %{glib2_ver}
+Requires:	gtk+3 >= %{gtk3_ver}
+Requires:	libnotify >= 0.7
+
+%description timer
+Timer applet starts a timer and shows notification when it is
+finished.
 
-%description stickynotes -l pl
-Aplet notatek.
+%description timer -l pl.UTF-8
+Aplet minutnika - pozwala uruchomić odliczanie czasu i powiadomić o
+jego ukończeniu.
 
 %package trash
 Summary:	Trash applet
-Summary(pl):	Aplet ¶mietnika
+Summary(pl.UTF-8):	Aplet śmietnika
 Group:		X11/Applications
-Requires(post,postun):	scrollkeeper
+URL:		https://help.gnome.org/users/trashapplet/stable/
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Conflicts:	gnome-applets <= 0:2.10.0-5
+Requires:	glib2 >= %{glib2_ver}
+Requires:	gtk+3 >= %{gtk3_ver}
 
 %description trash
-Trash applet.
+The Panel Trash applet lets you manage your Trash from the panel.
+
+The trash on your panel acts identically to the trash on your desktop,
+however it is useful because your panels are always visible.
+
+%description trash -l pl.UTF-8
+Aplet śmietnika pozwala na zarządzanie śmietnikiem z poziomu panelu.
+
+Śmietnik w panelu zachowuje się tak samo, jak śmietnik na pulpicie,
+ale jest przydatny o tyle, że panele są zawsze widoczne.
+
+%package windowpicker
+Summary:	Window Picker applet
+Summary(pl.UTF-8):	Aplet do wybierania okien
+Group:		X11/Applications
+Requires(post,postun):	glib2 >= %{glib2_ver}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	glib2 >= %{glib2_ver}
+Requires:	gtk+3 >= %{gtk3_ver}
+Requires:	libwnck >= 3.14.1
+
+%description windowpicker
+Window Picker is a port of the initial window-picker-applet made by
+Cannonical to GNOME 3 and GTK+ 3. It give you a task list that only
+contains the icons of each open window, but not the title. This saves
+a lot of space, especially if you have many open windows. You can use
+the mouse to reorder icons by drag and drop. Also on there are
+preferences to set additional options, such as greying out inactive
+icons.
+
+%description windowpicker -l pl.UTF-8
+Window Picket to port programu window-picker-applet napisanego przez
+Cannonical do środowiska GNOME 3 i GTK+ 3. Aplet podaje listę zadań
+zawierającą tylko ikony każdego otwartego okna, bez tytułu - oszczędza
+to dużo miejsca, zwłaszcza w przypadku wielu otwartych okien. Można
+zmieniać kolejność ikon myszką przez przeciąganie i upuszczanie.
+Dostępne są także ustawienia dla dodatkowych opcji, takich jak
+wyszarzanie nieaktywnych ikon.
+
+%package window-buttons
+Summary:	Window buttons for your GNOME Panel
+Group:		X11/Applications
+Requires(post,postun):	glib2 >= %{glib2_ver}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description window-buttons
+GNOME violates Fitts's Law by putting a panel between the maxed window
+buttons and the corner of the screen. These applets were designed to
+solve the problem. Window Title and Window Buttons are essentially
+controls for windows that are placed on the Panel instead of a window.
+They also provide a clever way to increase vertical screen space. By
+default they only control maximized windows, but can be configured to
+control any focused window.
+
+%package window-title
+Summary:	Window title for your GNOME Panel
+Group:		X11/Applications
+Requires(post,postun):	glib2 >= %{glib2_ver}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 
-%description trash -l pl
-Aplet ¶mietnika.
+%description window-title
+GNOME violates Fitts's Law by putting a panel between the maxed window
+buttons and the corner of the screen. These applets were designed to
+solve the problem. Window Title and Window Buttons are essentially
+controls for windows that are placed on the Panel instead of a window.
+They also provide a clever way to increase vertical screen space. By
+default they only control maximized windows, but can be configured to
+control any focused window.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
-%{__gnome_doc_prepare}
-%{__libtoolize}
-%{__glib_gettextize}
-%{__intltoolize}
-%{__aclocal} -I m4
-%{__autoheader}
-%{__gnome_doc_common}
-%{__automake}
-%{__autoconf}
 %configure \
-	--disable-static \
-	--disable-schemas-install \
+	--disable-silent-rules \
 	--enable-mini-commander \
-	--enable-stickynotes \
-	%{!?with_modemlights:--disable-modemlights}
+	--with-cpufreq-lib=cpupower
+
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 \
-	pythondir=%{py_sitedir}
+	DESTDIR=$RPM_BUILD_ROOT
+
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/gnome-applets/lib*.la
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/libgweather.la
-rm -f $RPM_BUILD_ROOT%{py_sitedir}/invest/*.py
-rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/{es_*,no}
+# es is more recent
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/es_ES
 
-%find_lang %{name} --all-name --with-gnome
+%find_lang %{name}-3.0
 %find_lang accessx-status --with-gnome
 %find_lang battstat --with-gnome
 %find_lang char-palette --with-gnome
@@ -377,10 +569,10 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/{es_*,no}
 %find_lang cpufreq-applet --with-gnome
 %find_lang drivemount --with-gnome
 %find_lang geyes --with-gnome
-%find_lang gswitchit --with-gnome
 %find_lang gweather --with-gnome
-%find_lang mixer_applet2 --with-gnome
+%find_lang invest-applet --with-gnome
 %find_lang multiload --with-gnome
+%find_lang netspeed_applet --with-gnome
 %find_lang stickynotes_applet --with-gnome
 %find_lang trashapplet --with-gnome
 
@@ -388,133 +580,79 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/{es_*,no}
 rm -rf $RPM_BUILD_ROOT
 
 %post accessx-status
-%scrollkeeper_update_post
-%banner %{name} -e << EOF
-For full functionality, you need to install control-center.
-EOF
 %update_icon_cache hicolor
 
 %postun accessx-status
-%scrollkeeper_update_postun
 %update_icon_cache hicolor
 
 %post battstat
-%scrollkeeper_update_post
-%gconf_schema_install battstat.schemas
-
-%preun battstat
-%gconf_schema_uninstall battstat.schemas
+%glib_compile_schemas
 
 %postun battstat
-%scrollkeeper_update_postun
+%glib_compile_schemas
 
-%post charpicker
-%scrollkeeper_update_post
-%gconf_schema_install charpick.schemas
+%post brightness
 %update_icon_cache hicolor
 
-%preun charpicker
-%gconf_schema_uninstall charpick.schemas
+%postun brightness
+%update_icon_cache hicolor
+
+%post charpicker
+%glib_compile_schemas
 
 %postun charpicker
-%scrollkeeper_update_postun
-%update_icon_cache hicolor
+%glib_compile_schemas
+
+%post command
+%glib_compile_schemas
+
+%postun command
+%glib_compile_schemas
 
 %post cpufreq
-%scrollkeeper_update_post
-%gconf_schema_install cpufreq-applet.schemas
-%banner %{name} -e << EOF
-For full functionality, set SUID /usr/bin/cpufreq-selector binary.
-EOF
+%glib_compile_schemas
 %update_icon_cache hicolor
 
-%preun cpufreq
-%gconf_schema_uninstall cpufreq-applet.schemas
-
 %postun cpufreq
-%scrollkeeper_update_postun
+%glib_compile_schemas
 %update_icon_cache hicolor
 
-%post drivemount
-%scrollkeeper_update_post
-%gconf_schema_install drivemount.schemas
-
-%preun drivemount
-%gconf_schema_uninstall drivemount.schemas
-
-%postun drivemount 
-%scrollkeeper_update_postun
-
 %post geyes
-%scrollkeeper_update_post
-%gconf_schema_install geyes.schemas
+%glib_compile_schemas
 %update_icon_cache hicolor
 
-%preun geyes
-%gconf_schema_uninstall geyes.schemas
-
-%postun geyes 
-%scrollkeeper_update_postun
+%postun geyes
+%glib_compile_schemas
 %update_icon_cache hicolor
 
 %post gweather
-/sbin/ldconfig
-%scrollkeeper_update_post
-%gconf_schema_install gweather.schemas
-
-%preun gweather
-%gconf_schema_uninstall gweather.schemas
+%glib_compile_schemas
 
 %postun gweather
-/sbin/ldconfig
-%scrollkeeper_update_postun
+%glib_compile_schemas
 
-%post invest
-%scrollkeeper_update_post
-
-%postun invest
-%scrollkeeper_update_postun
+%post inhibit
+%update_icon_cache hicolor
 
-%post keyboard
-%scrollkeeper_update_post
-%gconf_schema_install gswitchit.schemas
+%postun inhibit
 %update_icon_cache hicolor
 
-%preun keyboard
-%gconf_schema_uninstall gswitchit.schemas
+%post invest
+%glib_compile_schemas
+%update_icon_cache hicolor
 
-%postun keyboard
-%scrollkeeper_update_postun
+%postun invest
+%glib_compile_schemas
 %update_icon_cache hicolor
 
 %post minicommander
-%scrollkeeper_update_post
-%gconf_schema_install mini-commander-global.schemas
-%gconf_schema_install mini-commander.schemas
-GCONF_CONFIG_SOURCE="`%{_bindir}/gconftool-2 --get-default-source`" %{_libdir}/%{name}/mc-install-default-macros
+%glib_compile_schemas
 %update_icon_cache hicolor
 
-%preun minicommander
-%gconf_schema_uninstall mini-commander-global.schemas
-%gconf_schema_uninstall mini-commander.schemas
-
 %postun minicommander
-%scrollkeeper_update_postun
+%glib_compile_schemas
 %update_icon_cache hicolor
 
-%post mixer
-%scrollkeeper_update_post
-%gconf_schema_install mixer.schemas
-%banner %{name} -e << EOF
-For full functionality, you need to install gnome-media-volume-control.
-EOF
-
-%preun mixer
-%gconf_schema_uninstall mixer.schemas
-
-%postun mixer
-%scrollkeeper_update_postun
-
 %post modemlights
 %update_icon_cache hicolor
 
@@ -522,350 +660,282 @@ EOF
 %update_icon_cache hicolor
 
 %post multiload
-%scrollkeeper_update_post
-%gconf_schema_install multiload.schemas
-%banner %{name} -e << EOF
-For full functionality, you need to install gnome-system-monitor.
-EOF
-
-%preun multiload
-%gconf_schema_uninstall multiload.schemas
+%glib_compile_schemas
 
 %postun multiload
-%scrollkeeper_update_postun
+%glib_compile_schemas
 
-%post stickynotes
-%scrollkeeper_update_post
-%gconf_schema_install stickynotes.schemas
+%post netspeed
+%glib_compile_schemas
+%update_icon_cache hicolor
+
+%postun netspeed
+%glib_compile_schemas
 %update_icon_cache hicolor
 
-%preun stickynotes
-%gconf_schema_uninstall stickynotes.schemas
+%post stickynotes
+%glib_compile_schemas
+%update_icon_cache hicolor
 
 %postun stickynotes
-%scrollkeeper_update_postun
+%glib_compile_schemas
 %update_icon_cache hicolor
 
-%post trash
-%scrollkeeper_update_post
+%post timer
+%glib_compile_schemas
 
-%postun trash
-%scrollkeeper_update_postun
+%postun timer
+%glib_compile_schemas
 
-%files -f %{name}.lang
-%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README
-%attr(755,root,root) %{_libdir}/null_applet
-%{_libdir}/bonobo/servers/GNOME_CDPlayerApplet.server
-%{_libdir}/bonobo/servers/GNOME_MailcheckApplet_Factory.server
-%{_libdir}/bonobo/servers/GNOME_NullApplet_Factory.server
-%{_libdir}/bonobo/servers/GNOME_Panel_WirelessApplet.server
-%dir %{_libdir}/%{name}
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/glade
-
-%files devel
+%post windowpicker
+%glib_compile_schemas
+
+%postun windowpicker
+%glib_compile_schemas
+
+%post window-buttons
+%glib_compile_schemas
+
+%postun window-buttons
+%glib_compile_schemas
+
+%post window-title
+%glib_compile_schemas
+
+%postun window-title
+%glib_compile_schemas
+
+%files -f %{name}-3.0.lang
 %defattr(644,root,root,755)
-%{_includedir}/*
-%{_pkgconfigdir}/*.pc
+%doc AUTHORS ChangeLog MAINTAINERS NEWS README
+%dir %{_libdir}/gnome-applets
+%dir %{_datadir}/gnome-applets
+%dir %{_datadir}/gnome-applets/builder
+%dir %{_datadir}/gnome-applets/icons
+%dir %{_datadir}/gnome-applets/icons/hicolor
+%dir %{_datadir}/gnome-applets/icons/hicolor/16x16
+%dir %{_datadir}/gnome-applets/icons/hicolor/16x16/status
+%dir %{_datadir}/gnome-applets/icons/hicolor/22x22
+%dir %{_datadir}/gnome-applets/icons/hicolor/22x22/status
+%dir %{_datadir}/gnome-applets/icons/hicolor/24x24
+%dir %{_datadir}/gnome-applets/icons/hicolor/24x24/status
+%dir %{_datadir}/gnome-applets/icons/hicolor/32x32
+%dir %{_datadir}/gnome-applets/icons/hicolor/32x32/status
+%dir %{_datadir}/gnome-applets/icons/hicolor/48x48
+%dir %{_datadir}/gnome-applets/icons/hicolor/48x48/status
+%dir %{_datadir}/gnome-applets/icons/hicolor/scalable
+%dir %{_datadir}/gnome-applets/icons/hicolor/scalable/status
+%dir %{_datadir}/gnome-applets/ui
+%dir %{_datadir}/gnome-panel/applets
 
 %files accessx-status -f accessx-status.lang
 %defattr(644,root,root,755)
-%doc accessx-status/ChangeLog
-%attr(755,root,root) %{_libdir}/accessx-status-applet
-%{_libdir}/bonobo/servers/GNOME_AccessxStatusApplet.server
-%{_datadir}/gnome-2.0/ui/GNOME_AccessxApplet.xml
-%{_pixmapsdir}/accessx-status-applet
+%doc accessx-status/AUTHORS
+%attr(755,root,root) %{_libdir}/gnome-applets/libaccessx-status-applet.so
+%{_datadir}/gnome-applets/accessx-status-applet
+%{_datadir}/gnome-applets/ui/accessx-status-applet-menu.xml
+%{_datadir}/gnome-panel/applets/org.gnome.applets.AccessxStatusApplet.panel-applet
 %{_iconsdir}/hicolor/48x48/apps/ax-applet.png
-%dir %{_omf_dest_dir}/accessx-status
-%{_omf_dest_dir}/accessx-status/accessx-status-C.omf
-%lang(bg) %{_omf_dest_dir}/accessx-status/accessx-status-bg.omf
-%lang(es) %{_omf_dest_dir}/accessx-status/accessx-status-es.omf
-%lang(fr) %{_omf_dest_dir}/accessx-status/accessx-status-fr.omf
-%lang(it) %{_omf_dest_dir}/accessx-status/accessx-status-it.omf
-%lang(nl) %{_omf_dest_dir}/accessx-status/accessx-status-nl.omf
-%lang(sv) %{_omf_dest_dir}/accessx-status/accessx-status-sv.omf
-%lang(uk) %{_omf_dest_dir}/accessx-status/accessx-status-uk.omf
 
 %files battstat -f battstat.lang
 %defattr(644,root,root,755)
-%doc battstat/ChangeLog
-%attr(755,root,root) %{_libdir}/battstat-applet-2
-%{_libdir}/bonobo/servers/GNOME_BattstatApplet.server
-%{_datadir}/gnome-2.0/ui/GNOME_BattstatApplet.xml
-%{_datadir}/%{name}/glade/battstat_applet.glade
-%{_sysconfdir}/gconf/schemas/battstat.schemas
+%attr(755,root,root) %{_libdir}/gnome-applets/libbattery-status-applet.so
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-applets.battstat.gschema.xml
+%{_datadir}/gnome-applets/builder/battstat_applet.ui
+%{_datadir}/gnome-applets/ui/battstat-applet-menu.xml
+%{_datadir}/gnome-panel/applets/org.gnome.applets.BattstatApplet.panel-applet
 %{_sysconfdir}/sound/events/battstat_applet.soundlist
-%dir %{_omf_dest_dir}/battstat
-%{_omf_dest_dir}/battstat/battstat-C.omf
-%lang(bg) %{_omf_dest_dir}/battstat/battstat-bg.omf
-%lang(es) %{_omf_dest_dir}/battstat/battstat-es.omf
-%lang(fr) %{_omf_dest_dir}/battstat/battstat-fr.omf
-%lang(sv) %{_omf_dest_dir}/battstat/battstat-sv.omf
-%lang(uk) %{_omf_dest_dir}/battstat/battstat-uk.omf
+
+%files brightness
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/gnome-applets/libbrightness-applet.so
+%{_datadir}/gnome-applets/icons/hicolor/16x16/status/gpm-brightness-lcd*.png
+%{_datadir}/gnome-applets/icons/hicolor/22x22/status/gpm-brightness-lcd*.png
+%{_datadir}/gnome-applets/icons/hicolor/24x24/status/gpm-brightness-lcd*.png
+%{_datadir}/gnome-applets/icons/hicolor/32x32/status/gpm-brightness-lcd*.png
+%{_datadir}/gnome-applets/icons/hicolor/48x48/status/gpm-brightness-lcd*.png
+%{_datadir}/gnome-applets/icons/hicolor/scalable/status/gpm-brightness-lcd*.svg
+%{_datadir}/gnome-applets/ui/brightness-applet-menu.xml
+%{_datadir}/gnome-panel/applets/org.gnome.BrightnessApplet.panel-applet
+%{_iconsdir}/hicolor/*x*/apps/gnome-brightness-applet.png
+%{_iconsdir}/hicolor/scalable/apps/gnome-brightness-applet.svg
 
 %files charpicker -f char-palette.lang
 %defattr(644,root,root,755)
-%doc charpick/ChangeLog
-%attr(755,root,root) %{_libdir}/charpick_applet2
-%{_libdir}/bonobo/servers/GNOME_CharpickerApplet.server
-%{_datadir}/gnome-2.0/ui/GNOME_CharpickerApplet.xml
-%{_iconsdir}/hicolor/48x48/apps/charpick.png
-%{_sysconfdir}/gconf/schemas/charpick.schemas
-%dir %{_omf_dest_dir}/char-palette
-%{_omf_dest_dir}/char-palette/char-palette-C.omf
-%lang(bg) %{_omf_dest_dir}/char-palette/char-palette-bg.omf
-%lang(es) %{_omf_dest_dir}/char-palette/char-palette-es.omf
-%lang(fr) %{_omf_dest_dir}/char-palette/char-palette-fr.omf
-%lang(it) %{_omf_dest_dir}/char-palette/char-palette-it.omf
-%lang(nl) %{_omf_dest_dir}/char-palette/char-palette-nl.omf
-%lang(pt_BR) %{_omf_dest_dir}/char-palette/char-palette-pt_BR.omf
-%lang(sv) %{_omf_dest_dir}/char-palette/char-palette-sv.omf
-%lang(uk) %{_omf_dest_dir}/char-palette/char-palette-uk.omf
+%attr(755,root,root) %{_libdir}/gnome-applets/libcharacter-picker-applet.so
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-applets.charpick.gschema.xml
+%{_datadir}/gnome-applets/ui/charpick-applet-menu.xml
+%{_datadir}/gnome-panel/applets/org.gnome.applets.CharpickerApplet.panel-applet
+
+%files command
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/gnome-applets/libcommand-applet.so
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-applets.command.gschema.xml
+%{_datadir}/gnome-panel/applets/org.gnome.applets.CommandApplet.panel-applet
 
 %files cpufreq -f cpufreq-applet.lang
 %defattr(644,root,root,755)
-%doc cpufreq/ChangeLog
+%doc cpufreq/AUTHORS
 %attr(755,root,root) %{_bindir}/cpufreq-selector
-%attr(755,root,root) %{_libdir}/cpufreq-applet
-%{_libdir}/bonobo/servers/GNOME_CPUFreqApplet.server
-%{_datadir}/gnome-2.0/ui/GNOME_CPUFreqApplet.xml
-%{_datadir}/%{name}/glade/cpufreq-preferences.glade
-%{_sysconfdir}/gconf/schemas/cpufreq-applet.schemas
-%{_pixmapsdir}/cpufreq-applet
-%{_iconsdir}/hicolor/*/apps/gnome-cpu-frequency-applet.*
-%dir %{_omf_dest_dir}/cpufreq-applet
-%{_omf_dest_dir}/cpufreq-applet/cpufreq-applet-C.omf
-%lang(es) %{_omf_dest_dir}/cpufreq-applet/cpufreq-applet-es.omf
-%lang(fr) %{_omf_dest_dir}/cpufreq-applet/cpufreq-applet-fr.omf
-%lang(nl) %{_omf_dest_dir}/cpufreq-applet/cpufreq-applet-nl.omf
-%lang(sv) %{_omf_dest_dir}/cpufreq-applet/cpufreq-applet-sv.omf
-%lang(uk) %{_omf_dest_dir}/cpufreq-applet/cpufreq-applet-uk.omf
-%lang(zh_CN) %{_omf_dest_dir}/cpufreq-applet/cpufreq-applet-zh_CN.omf
+%attr(755,root,root) %{_libdir}/gnome-applets/libcpu-frequency-applet.so
+%{_datadir}/dbus-1/system-services/org.gnome.CPUFreqSelector.service
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-applets.cpufreq.enums.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-applets.cpufreq.gschema.xml
+%{_datadir}/gnome-applets/builder/cpufreq-preferences.ui
+%{_datadir}/gnome-applets/cpufreq-applet
+%{_datadir}/gnome-applets/ui/cpufreq-applet-menu.xml
+%{_datadir}/gnome-panel/applets/org.gnome.applets.CPUFreqApplet.panel-applet
+%{_datadir}/polkit-1/actions/org.gnome.cpufreqselector.policy
+/etc/dbus-1/system.d/org.gnome.CPUFreqSelector.conf
+%{_iconsdir}/hicolor/*x*/apps/gnome-cpu-frequency-applet.png
+%{_iconsdir}/hicolor/scalable/apps/gnome-cpu-frequency-applet.svg
 
 %files drivemount -f drivemount.lang
 %defattr(644,root,root,755)
-%doc drivemount/ChangeLog
-%attr(755,root,root) %{_libdir}/drivemount_applet2
-%{_libdir}/bonobo/servers/GNOME_DriveMountApplet.server
-%{_datadir}/gnome-2.0/ui/GNOME_DriveMountApplet.xml
-%{_sysconfdir}/gconf/schemas/drivemount.schemas
-%dir %{_omf_dest_dir}/drivemount
-%{_omf_dest_dir}/drivemount/drivemount-C.omf
-%lang(es) %{_omf_dest_dir}/drivemount/drivemount-es.omf
-%lang(fr) %{_omf_dest_dir}/drivemount/drivemount-fr.omf
-%lang(it) %{_omf_dest_dir}/drivemount/drivemount-it.omf
-%lang(pa) %{_omf_dest_dir}/drivemount/drivemount-pa.omf
-%lang(sv) %{_omf_dest_dir}/drivemount/drivemount-sv.omf
-%lang(uk) %{_omf_dest_dir}/drivemount/drivemount-uk.omf
-%lang(zh_CN) %{_omf_dest_dir}/drivemount/drivemount-zh_CN.omf
+%doc drivemount/AUTHORS
+%attr(755,root,root) %{_libdir}/gnome-applets/libdrive-mount-applet.so
+%{_datadir}/gnome-applets/ui/drivemount-applet-menu.xml
+%{_datadir}/gnome-panel/applets/org.gnome.applets.DriveMountApplet.panel-applet
 
 %files geyes -f geyes.lang
 %defattr(644,root,root,755)
-%doc geyes/ChangeLog
-%attr(755,root,root) %{_libdir}/geyes_applet2
-%{_libdir}/bonobo/servers/GNOME_GeyesApplet.server
-%{_datadir}/gnome-2.0/ui/GNOME_GeyesApplet.xml
-%{_datadir}/%{name}/geyes
-%{_iconsdir}/hicolor/*/apps/gnome-eyes-applet.*
-%{_sysconfdir}/gconf/schemas/geyes.schemas
-%dir %{_omf_dest_dir}/geyes
-%{_omf_dest_dir}/geyes/geyes-C.omf
-%lang(bg) %{_omf_dest_dir}/geyes/geyes-bg.omf
-%lang(es) %{_omf_dest_dir}/geyes/geyes-es.omf
-%lang(fr) %{_omf_dest_dir}/geyes/geyes-fr.omf
-%lang(it) %{_omf_dest_dir}/geyes/geyes-it.omf
-%lang(ru) %{_omf_dest_dir}/geyes/geyes-ru.omf
-%lang(sv) %{_omf_dest_dir}/geyes/geyes-sv.omf
-%lang(uk) %{_omf_dest_dir}/geyes/geyes-uk.omf
+%doc geyes/{AUTHORS,README.themes}
+%attr(755,root,root) %{_libdir}/gnome-applets/libgeyes-applet.so
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-applets.geyes.gschema.xml
+%{_datadir}/gnome-applets/geyes
+%{_datadir}/gnome-applets/ui/geyes-applet-menu.xml
+%{_datadir}/gnome-panel/applets/org.gnome.applets.GeyesApplet.panel-applet
+%{_iconsdir}/hicolor/*x*/apps/gnome-eyes-applet.png
+%{_iconsdir}/hicolor/scalable/apps/gnome-eyes-applet.svg
 
 %files gweather -f gweather.lang
 %defattr(644,root,root,755)
-%doc gweather/ChangeLog
-%attr(755,root,root) %{_libdir}/gweather-applet-2
-%attr(755,root,root) %{_libdir}/libgweather.so*
-%{_libdir}/bonobo/servers/GNOME_GWeatherApplet_Factory.server
-%{_datadir}/gnome-2.0/ui/GNOME_GWeatherApplet.xml
-%{_datadir}/%{name}/gweather
-%{_sysconfdir}/gconf/schemas/gweather.schemas
-%dir %{_omf_dest_dir}/gweather
-%{_omf_dest_dir}/gweather/gweather-C.omf
-%lang(es) %{_omf_dest_dir}/gweather/gweather-es.omf
-%lang(fr) %{_omf_dest_dir}/gweather/gweather-fr.omf
-%lang(nl) %{_omf_dest_dir}/gweather/gweather-nl.omf
-%lang(sv) %{_omf_dest_dir}/gweather/gweather-sv.omf
-%lang(uk) %{_omf_dest_dir}/gweather/gweather-uk.omf
-
-%files invest
+%doc gweather/AUTHORS
+%attr(755,root,root) %{_libdir}/gnome-applets/libgweather-applet.so
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-applets.gweather.gschema.xml
+%{_datadir}/gnome-applets/ui/gweather-applet-menu.xml
+%{_datadir}/gnome-panel/applets/org.gnome.applets.GWeatherApplet.panel-applet
+
+%files inhibit
 %defattr(644,root,root,755)
-%doc invest-applet/ChangeLog
-%attr(755,root,root) %{_bindir}/invest-chart
-%attr(755,root,root) %{_libdir}/invest-applet
-%{_libdir}/bonobo/servers/GNOME_GtikApplet.server
-%{_libdir}/bonobo/servers/Invest_Applet.server
-%{_datadir}/gnome-2.0/ui/Invest_Applet.xml
-%{_datadir}/%{name}/invest-applet
-%{_datadir}/%{name}/glade/financialchart.glade
-%{_datadir}/%{name}/glade/prefs-dialog.glade
-%{_desktopdir}/invest-chart.desktop
-%{_pixmapsdir}/invest-big.png
-%dir %{py_sitedir}/invest
-%{py_sitedir}/invest/*.py[co]
-
-%files keyboard -f gswitchit.lang
+%attr(755,root,root) %{_libdir}/gnome-applets/libinhibit-applet.so
+%{_datadir}/gnome-applets/icons/hicolor/16x16/status/gpm-inhibit*.png
+%{_datadir}/gnome-applets/icons/hicolor/16x16/status/gpm-uninhibit.png
+%{_datadir}/gnome-applets/icons/hicolor/22x22/status/gpm-inhibit*.png
+%{_datadir}/gnome-applets/icons/hicolor/22x22/status/gpm-uninhibit.png
+%{_datadir}/gnome-applets/icons/hicolor/24x24/status/gpm-inhibit*.png
+%{_datadir}/gnome-applets/icons/hicolor/24x24/status/gpm-uninhibit.png
+%{_datadir}/gnome-applets/icons/hicolor/32x32/status/gpm-inhibit*.png
+%{_datadir}/gnome-applets/icons/hicolor/32x32/status/gpm-uninhibit.png
+%{_datadir}/gnome-applets/icons/hicolor/48x48/status/gpm-inhibit*.png
+%{_datadir}/gnome-applets/icons/hicolor/48x48/status/gpm-uninhibit.png
+%{_datadir}/gnome-applets/icons/hicolor/scalable/status/gpm-inhibit*.svg
+%{_datadir}/gnome-applets/icons/hicolor/scalable/status/gpm-uninhibit.svg
+%{_datadir}/gnome-applets/ui/inhibit-applet-menu.xml
+%{_datadir}/gnome-panel/applets/org.gnome.InhibitApplet.panel-applet
+%{_iconsdir}/hicolor/*x*/apps/gnome-inhibit-applet.png
+%{_iconsdir}/hicolor/scalable/apps/gnome-inhibit-applet.svg
+
+%files invest -f invest-applet.lang
 %defattr(644,root,root,755)
-%doc gswitchit/ChangeLog
-%attr(755,root,root) %{_libdir}/gnome-keyboard-applet
-%{_libdir}/bonobo/servers/GNOME_KeyboardApplet.server
-%{_desktopdir}/gswitchit-plugins.desktop
-%dir %{_datadir}/xmodmap
-%{_datadir}/xmodmap/base.xml
-%lang(hy) %{_datadir}/xmodmap/xmodmap.am*
-%lang(ar) %{_datadir}/xmodmap/xmodmap.ar*
-%lang(fr,nl,wa) %{_datadir}/xmodmap/xmodmap.be*
-%lang(bg) %{_datadir}/xmodmap/xmodmap.bg*
-%lang(pt_BR) %{_datadir}/xmodmap/xmodmap.br*
-%lang(de,fr) %{_datadir}/xmodmap/xmodmap.ch*
-%lang(cs) %{_datadir}/xmodmap/xmodmap.cz*
-%lang(de) %{_datadir}/xmodmap/xmodmap.de*
-%lang(da) %{_datadir}/xmodmap/xmodmap.dk*
-%{_datadir}/xmodmap/xmodmap.dvorak
-%lang(et) %{_datadir}/xmodmap/xmodmap.ee*
-%lang(es) %{_datadir}/xmodmap/xmodmap.es*
-%lang(fi) %{_datadir}/xmodmap/xmodmap.fi*
-%lang(fr) %{_datadir}/xmodmap/xmodmap.fr*
-%{_datadir}/xmodmap/xmodmap.gb*
-%lang(ka) %{_datadir}/xmodmap/xmodmap.ge*
-%lang(el) %{_datadir}/xmodmap/xmodmap.gr*
-%lang(hu) %{_datadir}/xmodmap/xmodmap.hu*
-%lang(he,yi) %{_datadir}/xmodmap/xmodmap.il*
-%lang(is) %{_datadir}/xmodmap/xmodmap.is*
-%lang(it) %{_datadir}/xmodmap/xmodmap.it*
-%lang(ja) %{_datadir}/xmodmap/xmodmap.jp*
-%lang(ko) %{_datadir}/xmodmap/xmodmap.kr*
-%lang(lo) %{_datadir}/xmodmap/xmodmap.la*
-%lang(lt) %{_datadir}/xmodmap/xmodmap.lt*
-%lang(mk) %{_datadir}/xmodmap/xmodmap.mk*
-%lang(mn) %{_datadir}/xmodmap/xmodmap.mn*
-%lang(nl) %{_datadir}/xmodmap/xmodmap.nl*
-%lang(nn,no) %{_datadir}/xmodmap/xmodmap.no*
-%lang(pl) %{_datadir}/xmodmap/xmodmap.pl*
-%lang(pt) %{_datadir}/xmodmap/xmodmap.pt*
-%lang(fr) %{_datadir}/xmodmap/xmodmap.qc*
-%lang(ro) %{_datadir}/xmodmap/xmodmap.ro*
-%lang(ru) %{_datadir}/xmodmap/xmodmap.ru*
-%lang(sv) %{_datadir}/xmodmap/xmodmap.se*
-%lang(fr) %{_datadir}/xmodmap/xmodmap.sf*
-%lang(de) %{_datadir}/xmodmap/xmodmap.sg*
-%lang(sl) %{_datadir}/xmodmap/xmodmap.si*
-%lang(sk) %{_datadir}/xmodmap/xmodmap.sk*
-%lang(th) %{_datadir}/xmodmap/xmodmap.th*
-%lang(tr) %{_datadir}/xmodmap/xmodmap.tr*
-%lang(uk) %{_datadir}/xmodmap/xmodmap.uk*
-%{_datadir}/xmodmap/xmodmap.us*
-%lang(hr,mk,sl,sr) %{_datadir}/xmodmap/xmodmap.yu*
-%attr(755,root,root) %{_bindir}/gswitchit-plugins-capplet
-%{_datadir}/gnome-2.0/ui/GNOME_GSwitchItApplet.xml
-%{_datadir}/%{name}/glade/gswitchit*.glade
-%{_iconsdir}/hicolor/48x48/apps/gswitchit*.png
-%{_sysconfdir}/gconf/schemas/gswitchit.schemas
-%dir %{_omf_dest_dir}/gswitchit
-%{_omf_dest_dir}/gswitchit/gswitchit-C.omf
-%lang(es) %{_omf_dest_dir}/gswitchit/gswitchit-es.omf
-%lang(fr) %{_omf_dest_dir}/gswitchit/gswitchit-fr.omf
-%lang(sv) %{_omf_dest_dir}/gswitchit/gswitchit-sv.omf
-%lang(uk) %{_omf_dest_dir}/gswitchit/gswitchit-uk.omf
+%attr(755,root,root) %{_libdir}/gnome-applets/libinvest-applet.so
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-applets.invest.gschema.xml
+%{_datadir}/gnome-applets/builder/financialchart.ui
+%{_datadir}/gnome-applets/builder/prefs-dialog.ui
+%{_datadir}/gnome-applets/invest-applet
+%{_datadir}/gnome-applets/ui/invest-applet-menu.xml
+%{_datadir}/gnome-panel/applets/org.gnome.applets.InvestApplet.panel-applet
+%{_iconsdir}/hicolor/*x*/apps/invest-applet.png
+%{_iconsdir}/hicolor/scalable/apps/invest-applet.svg
 
 %files minicommander -f command-line.lang
 %defattr(644,root,root,755)
-%doc mini-commander/ChangeLog
-%attr(755,root,root) %{_libdir}/mini_commander_applet
-%attr(755,root,root) %{_libdir}/%{name}/mc-install-default-macros
-%{_libdir}/bonobo/servers/GNOME_MiniCommanderApplet.server
-%{_datadir}/gnome-2.0/ui/GNOME_MiniCommanderApplet.xml
-%{_datadir}/%{name}/glade/mini-commander.glade
+%doc mini-commander/{AUTHORS,README,TODO}
+%attr(755,root,root) %{_libdir}/gnome-applets/libmini-commander-applet.so
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-applets.mini-commander.gschema.xml
+%{_datadir}/gnome-applets/builder/mini-commander.ui
+%{_datadir}/gnome-applets/ui/mini-commander-applet-menu.xml
+%{_datadir}/gnome-panel/applets/org.gnome.applets.MiniCommanderApplet.panel-applet
 %{_iconsdir}/hicolor/48x48/apps/gnome-mini-commander.png
-%{_sysconfdir}/gconf/schemas/mini-commander-global.schemas
-%{_sysconfdir}/gconf/schemas/mini-commander.schemas
-%dir %{_omf_dest_dir}/command-line
-%{_omf_dest_dir}/command-line/command-line-C.omf
-%lang(es) %{_omf_dest_dir}/command-line/command-line-es.omf
-%lang(fr) %{_omf_dest_dir}/command-line/command-line-fr.omf
-%lang(pt_BR) %{_omf_dest_dir}/command-line/command-line-pt_BR.omf
-%lang(sv) %{_omf_dest_dir}/command-line/command-line-sv.omf
-%lang(uk) %{_omf_dest_dir}/command-line/command-line-uk.omf
-
-%files mixer
-%defattr(644,root,root,755)
-%doc mixer/ChangeLog
-%attr(755,root,root) %{_libdir}/mixer_applet2
-%{_libdir}/bonobo/servers/GNOME_MixerApplet.server
-%{_datadir}/gnome-2.0/ui/GNOME_MixerApplet.xml
-%{_sysconfdir}/gconf/schemas/mixer.schemas
-%dir %{_omf_dest_dir}/mixer_applet2
-%{_omf_dest_dir}/mixer_applet2/mixer_applet2-C.omf
-%lang(es) %{_omf_dest_dir}/mixer_applet2/mixer_applet2-es.omf
-%lang(it) %{_omf_dest_dir}/mixer_applet2/mixer_applet2-it.omf
-%lang(fr) %{_omf_dest_dir}/mixer_applet2/mixer_applet2-fr.omf
-%lang(sv) %{_omf_dest_dir}/mixer_applet2/mixer_applet2-sv.omf
-%lang(uk) %{_omf_dest_dir}/mixer_applet2/mixer_applet2-uk.omf
-
-%if %{with modemlights}
+
 %files modemlights
 %defattr(644,root,root,755)
-%doc modemlights/ChangeLog
-%attr(755,root,root) %{_libdir}/modem_applet
-%{_libdir}/bonobo/servers/GNOME_ModemLights.server
-%{_datadir}/gnome-2.0/ui/GNOME_ModemLights.xml
-%{_datadir}/%{name}/glade/modemlights.glade
-%{_iconsdir}/hicolor/*/apps/gnome-modem-monitor-applet.*
-%endif
+%doc modem-lights/AUTHORS
+%attr(755,root,root) %{_libdir}/gnome-applets/libmodem-lights-applet.so
+%{_datadir}/gnome-applets/builder/modemlights.ui
+%{_datadir}/gnome-applets/ui/modem-applet-menu.xml
+%{_datadir}/gnome-panel/applets/org.gnome.applets.ModemApplet.panel-applet
+%{_iconsdir}/hicolor/*x*/apps/gnome-modem-monitor-applet.png
+%{_iconsdir}/hicolor/scalable/apps/gnome-modem-monitor-applet.svg
 
 %files multiload -f multiload.lang
 %defattr(644,root,root,755)
-%doc multiload/ChangeLog
-%attr(755,root,root) %{_libdir}/multiload-applet-2
-%{_libdir}/bonobo/servers/GNOME_MultiLoadApplet_Factory.server
-%{_datadir}/gnome-2.0/ui/GNOME_MultiloadApplet.xml
-%{_sysconfdir}/gconf/schemas/multiload.schemas
-%dir %{_omf_dest_dir}/multiload
-%{_omf_dest_dir}/multiload/multiload-C.omf
-%lang(es) %{_omf_dest_dir}/multiload/multiload-es.omf
-%lang(fr) %{_omf_dest_dir}/multiload/multiload-fr.omf
-%lang(sv) %{_omf_dest_dir}/multiload/multiload-sv.omf
-%lang(uk) %{_omf_dest_dir}/multiload/multiload-uk.omf
+%doc multiload/AUTHORS
+%attr(755,root,root) %{_libdir}/gnome-applets/libmultiload-applet.so
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-applets.multiload.gschema.xml
+%{_datadir}/gnome-applets/ui/multiload-applet-menu.xml
+%{_datadir}/gnome-panel/applets/org.gnome.applets.MultiLoadApplet.panel-applet
+
+%files netspeed -f netspeed_applet.lang
+%defattr(644,root,root,755)
+%doc netspeed/{AUTHORS,TODO}
+%attr(755,root,root) %{_libdir}/gnome-applets/libnet-speed-applet.so
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-applets.netspeed.gschema.xml
+%{_datadir}/gnome-applets/ui/netspeed-menu.xml
+%{_datadir}/gnome-panel/applets/org.gnome.panel.Netspeed.panel-applet
+%{_iconsdir}/hicolor/*x*/apps/netspeed-applet.png
+%{_iconsdir}/hicolor/scalable/apps/netspeed-applet.svg
+%{_iconsdir}/hicolor/16x16/devices/netspeed-*.png
+%{_iconsdir}/hicolor/24x24/status/netspeed-*.png
+
+%files search
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/gnome-applets/libtracker-search-bar-applet.so
+%{_datadir}/gnome-panel/applets/org.gnome.panel.SearchBar.panel-applet
 
 %files stickynotes -f stickynotes_applet.lang
 %defattr(644,root,root,755)
-%doc stickynotes/ChangeLog
-%attr(755,root,root) %{_libdir}/stickynotes_applet
-%{_libdir}/bonobo/servers/GNOME_StickyNotesApplet.server
-%{_datadir}/gnome-2.0/ui/GNOME_StickyNotesApplet.xml
-%{_datadir}/%{name}/glade/stickynotes.glade
-%{_pixmapsdir}/stickynotes
-%{_iconsdir}/hicolor/*/apps/gnome-sticky-notes-applet.*
-%{_sysconfdir}/gconf/schemas/stickynotes.schemas
-%dir %{_omf_dest_dir}/stickynotes_applet
-%{_omf_dest_dir}/stickynotes_applet/stickynotes_applet-C.omf
-%lang(es) %{_omf_dest_dir}/stickynotes_applet/stickynotes_applet-es.omf
-%lang(fr) %{_omf_dest_dir}/stickynotes_applet/stickynotes_applet-fr.omf
-%lang(sv) %{_omf_dest_dir}/stickynotes_applet/stickynotes_applet-sv.omf
-%lang(uk) %{_omf_dest_dir}/stickynotes_applet/stickynotes_applet-uk.omf
+%doc sticky-notes/{README,TODO}
+%attr(755,root,root) %{_libdir}/gnome-applets/libsticky-notes-applet.so
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-applets.stickynotes.gschema.xml
+%dir %{_datadir}/gnome-applets/icons/hicolor/48x48/apps
+%{_datadir}/gnome-applets/icons/hicolor/48x48/apps/stickynotes-stock-*.png
+%{_datadir}/gnome-panel/applets/org.gnome.applets.StickyNotesApplet.panel-applet
+%{_iconsdir}/hicolor/*x*/apps/gnome-sticky-notes-applet.png
+%{_iconsdir}/hicolor/scalable/apps/gnome-sticky-notes-applet.svg
+
+%files timer
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/gnome-applets/libtimer-applet.so
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-applets.timer.gschema.xml
+%{_datadir}/gnome-panel/applets/org.gnome.applets.TimerApplet.panel-applet
 
 %files trash -f trashapplet.lang
 %defattr(644,root,root,755)
-%doc trashapplet/ChangeLog
-%attr(755,root,root) %{_libdir}/trashapplet
-%{_libdir}/bonobo/servers/GNOME_Panel_TrashApplet.server
-%{_datadir}/%{name}/glade/trashapplet.glade
-%{_datadir}/gnome-2.0/ui/GNOME_Panel_TrashApplet.xml
-%dir %{_omf_dest_dir}/trashapplet
-%{_omf_dest_dir}/trashapplet/trashapplet-C.omf
-%lang(es) %{_omf_dest_dir}/trashapplet/trashapplet-es.omf
-%lang(fr) %{_omf_dest_dir}/trashapplet/trashapplet-fr.omf
-%lang(it) %{_omf_dest_dir}/trashapplet/trashapplet-it.omf
-%lang(nl) %{_omf_dest_dir}/trashapplet/trashapplet-nl.omf
-%lang(pa) %{_omf_dest_dir}/trashapplet/trashapplet-pa.omf
-%lang(ru) %{_omf_dest_dir}/trashapplet/trashapplet-ru.omf
-%lang(sv) %{_omf_dest_dir}/trashapplet/trashapplet-sv.omf
-%lang(uk) %{_omf_dest_dir}/trashapplet/trashapplet-uk.omf
+%doc trash/README
+%attr(755,root,root) %{_libdir}/gnome-applets/libtrash-applet.so
+%{_datadir}/gnome-panel/applets/org.gnome.applets.TrashApplet.panel-applet
+
+%files windowpicker
+%defattr(644,root,root,755)
+%doc windowpicker/{AUTHORS,TODO}
+%attr(755,root,root) %{_libdir}/gnome-applets/libwindow-picker-applet.so
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-applets.window-picker-applet.gschema.xml
+%{_datadir}/gnome-panel/applets/org.gnome.applets.WindowPicker.panel-applet
+
+%files window-buttons
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/gnome-applets/libwindow-buttons-applet.so
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-applets.window-buttons.gschema.xml
+%{_datadir}/gnome-applets/builder/windowbuttons.ui
+%{_datadir}/gnome-panel/applets/org.gnome.panel.WindowButtonsApplet.panel-applet
+%{_pixmapsdir}/windowbuttons-applet.png
+%{_datadir}/gnome-applets/window-buttons-applet
+
+%files window-title
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/gnome-applets/libwindow-title-applet.so
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-applets.window-title.gschema.xml
+%{_datadir}/gnome-applets/builder/windowtitle.ui
+%{_datadir}/gnome-panel/applets/org.gnome.panel.WindowTitleApplet.panel-applet
+%{_pixmapsdir}/windowtitle-applet.png