X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gnome-applets.spec;h=337eee62415c3ee8570f89f92211831f718e113a;hb=ea09356898f2a68276ccdb0c2e3a91187555fa12;hp=16a3281f2b25362c708cd9146bbae66ed76746c2;hpb=66e3bdd3aefeb0d393b66b3e2f247bceda7d05ce;p=packages%2Fgnome-applets.git

diff --git a/gnome-applets.spec b/gnome-applets.spec
index 16a3281..337eee6 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -1,93 +1,345 @@
 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.8.2
-Release:	2
+Version:	2.22.3
+Release:	1
 Epoch:		1
 License:	GPL v2, FDL
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.8/%{name}-%{version}.tar.bz2
-# Source0-md5:	10d83b6e031bad31d7cfefe2c4884bd7
-Patch0:		%{name}-stickynotes-title-size.patch
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-applets/2.22/%{name}-%{version}.tar.bz2
+# Source0-md5:	9e64d2827b0e8d2a03ebffb2c3499566
+Patch0:		%{name}-stb.patch
+Patch1:		%{name}-m4_fix.patch
 URL:		http://www.gnome.org/
-BuildRequires:	GConf2-devel >= 2.8.0.1
-BuildRequires:	autoconf
-BuildRequires:	automake
-BuildRequires:	gail-devel >= 1.8.0
+BuildRequires:	GConf2-devel >= 2.22.0
+BuildRequires:	autoconf >= 2.59
+BuildRequires:	automake >= 1:1.8
+BuildRequires:	cpufrequtils-devel >= 0.3
+BuildRequires:	dbus-glib-devel >= 0.73
+BuildRequires:	gail-devel >= 1.20.0
 BuildRequires:	gdbm-devel
 BuildRequires:	gettext-devel
-BuildRequires:	gnome-common >= 2.8.0-2
-BuildRequires:	gnome-panel-devel >= 2.8.0
-BuildRequires:	gnome-vfs2-devel >= 2.8.1
-BuildRequires:	gstreamer-plugins-devel >= 0.8.5
-BuildRequires:	gtk+2-devel >= 2:2.4.11
-BuildRequires:	intltool >= 0.31.3
-BuildRequires:	libgnome-devel >= 2.8.0
-BuildRequires:	libgnomecanvas-devel >= 2.8.0
-BuildRequires:	libgnomeui-devel >= 2.8.0
-BuildRequires:	libglade2-devel >= 1:2.4.0
-BuildRequires:	libgtop-devel >= 1:2.8.1
+BuildRequires:	glib2-devel >= 1:2.16.0
+BuildRequires:	gnome-common >= 2.20.0
+BuildRequires:	gnome-desktop-devel >= 2.22.0
+BuildRequires:	gnome-doc-utils >= 0.11.2
+BuildRequires:	gnome-icon-theme >= 2.22.0
+BuildRequires:	gnome-panel-devel >= 2.22.0
+BuildRequires:	gnome-settings-daemon-devel >= 2.22.5
+BuildRequires:	gnome-vfs2-devel >= 2.22.0
+BuildRequires:	gstreamer-plugins-base-devel >= 0.10.10
+BuildRequires:	gtk+2-devel >= 2:2.12.0
+BuildRequires:	gucharmap-devel >= 1.10.0
+BuildRequires:	hal-devel >= 0.5.9
+BuildRequires:	intltool >= 0.36.2
+BuildRequires:	libglade2-devel >= 1:2.6.2
+BuildRequires:	libgnomekbd-devel >= 2.21.4.1
+BuildRequires:	libgnomeui-devel >= 2.22.0
+BuildRequires:	libgtop-devel >= 1:2.22.0
+BuildRequires:	libgweather-devel >= 2.22.1
+BuildRequires:	libnotify-devel >= 0.4.2
+BuildRequires:	liboobs-devel >= 2.22.0
 BuildRequires:	libtool
-BuildRequires:	libwnck-devel >= 2.8.0
-BuildRequires:	libxml2-devel >= 2.6.11
-BuildRequires:	libxklavier-devel >= 1.03
+BuildRequires:	libwnck-devel >= 2.22.0
+BuildRequires:	libxklavier-devel >= 3.0
+BuildRequires:	libxml2-devel >= 1:2.6.30
+BuildRequires:	libxslt-progs >= 1.1.20
+BuildRequires:	pkgconfig >= 1:0.19
+BuildRequires:	python-gnome-desktop-devel >= 2.22.0
+BuildRequires:	python-pygtk-devel >= 2:2.10.4
+BuildRequires:	rpm-pythonprov
+BuildRequires:	rpmbuild(find_lang) >= 1.23
+BuildRequires:	rpmbuild(macros) >= 1.311
 BuildRequires:	scrollkeeper >= 0.3.11-4
-Requires(post):	GConf2 >= 2.7.92
-Requires(post):	scrollkeeper
-Requires:	gnome-vfs2 >= 2.8.1
-Requires:	gstreamer-audiosink
-Obsoletes:	gnotes_applet
+BuildRequires:	system-tools-backends >= 2.6.0
+Requires:	gnome-icon-theme >= 2.22.0
+Requires:	gnome-panel >= 2.22.0
+Requires:	gnome-vfs2 >= 2.22.0
+Requires:	hicolor-icon-theme
+Requires:	libgnomeui >= 2.22.0
+# 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 uk.UTF-8
+Пакет gnome-applets містить аплети Панелі GNOME, що збільшують
+комфортність роботи в середовищі GNOME.
+
+%description -l ru.UTF-8
+Пакет gnome-applets содержит апплеты Панели GNOME, увеличивающие
+комфортность работы в среде GNOME.
+
+%package accessx-status
+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):	scrollkeeper
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Suggests:	gnome-control-center >= 2.22.0
+Conflicts:	gnome-applets <= 0:2.10.0-5
+
+%description accessx-status
+Keyboard Accessibility Status applet.
+
+%description accessx-status -l pl.UTF-8
+Aplet stanu dostepności klawiatury.
+
+%package battstat
+Summary:	Battery Charge Monitor applet
+Summary(pl.UTF-8):	Aplet monitora stanu naładowania akumulatora
+Group:		X11/Applications
+Requires(post,postun):	scrollkeeper
+Requires(post,preun):	GConf2
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Conflicts:	gnome-applets <= 0:2.10.0-5
+
+%description battstat
+Battery Charge Monitor applet.
+
+%description battstat -l pl.UTF-8
+Aplet monitora stanu naładowania akumulatora.
+
+%package charpicker
+Summary:	Character Palette applet
+Summary(pl.UTF-8):	Aplet palety znaków
+Group:		X11/Applications
+Requires(post,postun):	gtk+2
+Requires(post,postun):	scrollkeeper
+Requires(post,preun):	GConf2
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Conflicts:	gnome-applets <= 0:2.10.0-5
+
+%description charpicker
+Character Palette applet.
+
+%description charpicker -l pl.UTF-8
+Aplet palety znaków.
+
+%package cpufreq
+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):	scrollkeeper
+Requires(post,preun):	GConf2
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Obsoletes:	gnome-applet-cpufreq
+Conflicts:	gnome-applets <= 0:2.10.0-5
+
+%description cpufreq
+CPU Frequency Scaling Monitor applet.
+
+%description cpufreq -l pl.UTF-8
+Aplet monitora częstotliwości procesora.
+
+%package drivemount
+Summary:	Disk Mounter applet
+Summary(pl.UTF-8):	Aplet do montowania dysków
+Group:		X11/Applications
+Requires(post,postun):	scrollkeeper
+Requires(post,preun):	GConf2
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Conflicts:	gnome-applets <= 0:2.10.0-5
+
+%description drivemount
+Disk Mounter applet.
+
+%description drivemount -l pl.UTF-8
+Aplet do monotwania dysków.
+
+%package geyes
+Summary:	Geyes applet
+Summary(pl.UTF-8):	Aplet geyes
+Group:		X11/Applications
+Requires(post,postun):	gtk+2
+Requires(post,postun):	scrollkeeper
+Requires(post,preun):	GConf2
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Conflicts:	gnome-applets <= 0:2.10.0-5
+
+%description geyes
+Geyes applet.
+
+%description geyes -l pl.UTF-8
+Aplet geyes.
+
+%package gweather
+Summary:	Weather Report applet
+Summary(pl.UTF-8):	Aplet raportu pogodowego
+Group:		X11/Applications
+Requires(post,postun):	scrollkeeper
+Requires(post,preun):	GConf2
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	notification-daemon
+Conflicts:	gnome-applets <= 0:2.10.0-5
+
+%description gweather
+Weather Report applet.
+
+%description gweather -l pl.UTF-8
+Aplet raportu pogodowego.
 
-%description -l ru
-ðÁËÅÔ gnome-applets ÓÏÄÅÒÖÉÔ ÁÐÐÌÅÔÙ ðÁÎÅÌÉ GNOME, Õ×ÅÌÉÞÉ×ÁÀÝÉÅ
-ËÏÍÆÏÒÔÎÏÓÔØ ÒÁÂÏÔÙ × ÓÒÅÄÅ GNOME.
+%package invest
+Summary:	Stock Ticker applet
+Summary(pl.UTF-8):	Aplet wskaźnika giełdowego
+Group:		X11/Applications
+Requires(post,postun):	scrollkeeper
+Requires(post,preun):	GConf2
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	python-gnome-extras-egg >= 2.14.2
+Obsoletes:	gnome-applets-gtik
+Conflicts:	gnome-applets <= 0:2.10.0-5
+
+%description invest
+Stock Ticker applet.
+
+%description invest -l pl.UTF-8
+Aplet wskaźnika giełdowego.
+
+%package keyboard
+Summary:	Keyboard Indicator applet
+Summary(pl.UTF-8):	Aplet wskaźnika klawiatury
+Group:		X11/Applications
+Requires(post,postun):	gtk+2
+Requires(post,postun):	scrollkeeper
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Conflicts:	gnome-applets <= 0:2.10.0-5
+
+%description keyboard
+Keyboard Indicator applet.
+
+%description keyboard -l pl.UTF-8
+Aplet wskaźnika klawiatury.
+
+%package minicommander
+Summary:	Command Line applet
+Summary(pl.UTF-8):	Aplet wiersza poleceń
+Group:		X11/Applications
+Requires(post,postun):	scrollkeeper
+Requires(post,preun):	GConf2
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Conflicts:	gnome-applets <= 0:2.10.0-5
+
+%description minicommander
+Command Line applet.
 
-%package devel
-Summary:	Header files for gnome-applets
-Summary(pl):	Pliki nag³ówkowe gnome-applets
-Group:		Development/Libraries
+%description minicommander -l pl.UTF-8
+Aplet wiersza poleceń.
+
+%package mixer
+Summary:	Volume Control applet
+Summary(pl.UTF-8):	Aplet regulacji głośności
+Group:		X11/Applications
+Requires(post,postun):	gtk+2
+Requires(post,postun):	scrollkeeper
+Requires(post,preun):	GConf2
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	GConf2-devel >= 2.8.0.1
-Requires:	gtk+2-devel >= 2:2.4.11
+Requires:	gstreamer-audio-effects-base >= 0.10.10
+Requires:	gstreamer-audiosink
+Suggests:	gnome-media-volume-control >= 2.22.0
+Conflicts:	gnome-applets <= 0:2.10.0-5
+
+%description mixer
+Volume Control applet.
+
+%description mixer -l pl.UTF-8
+Aplet regulacji głośności.
 
-%description devel
-Header files for gnome-applets.
+%package modemlights
+Summary:	Modem Lights applet
+Summary(pl.UTF-8):	Aplet kontrolek modemu
+Group:		X11/Applications
+Requires(post,postun):	gtk+2
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	system-tools-backends
+Conflicts:	gnome-applets <= 0:2.10.0-5
 
-%description devel -l pl
-Pliki nag³ówkowe gnome-applets.
+%description modemlights
+Modem Lights applet.
+
+%description modemlights -l pl.UTF-8
+Aplet kontrolek modemu.
+
+%package multiload
+Summary:	System Monitor applet
+Summary(pl.UTF-8):	Aplet monitora systemu
+Group:		X11/Applications
+Requires(post,postun):	scrollkeeper
+Requires(post,preun):	GConf2
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Suggests:	gnome-system-monitor >= 2.22.0
+Conflicts:	gnome-applets <= 0:2.10.0-5
+
+%description multiload
+System Monitor applet.
+
+%description multiload -l pl.UTF-8
+Aplet monitora systemu.
+
+%package stickynotes
+Summary:	Sticky Notes applet
+Summary(pl.UTF-8):	Aplet notatek
+Group:		X11/Applications
+Requires(post,postun):	gtk+2
+Requires(post,postun):	scrollkeeper
+Requires(post,preun):	GConf2
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Obsoletes:	gnotes_applet
+Conflicts:	gnome-applets <= 0:2.10.0-5
+
+%description stickynotes
+Sticky Notes applet.
+
+%description stickynotes -l pl.UTF-8
+Aplet notatek.
+
+%package trash
+Summary:	Trash applet
+Summary(pl.UTF-8):	Aplet śmietnika
+Group:		X11/Applications
+Requires(post,postun):	scrollkeeper
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Conflicts:	gnome-applets <= 0:2.10.0-5
+
+%description trash
+Trash applet.
+
+%description trash -l pl.UTF-8
+Aplet śmietnika.
 
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
-cp /usr/share/gnome-common/data/omf.make .
-%{__aclocal}
+%{__gnome_doc_prepare}
 %{__libtoolize}
-glib-gettextize --copy --force
-intltoolize --copy --force
+%{__glib_gettextize}
+%{__intltoolize}
+%{__aclocal} -I m4
 %{__autoheader}
-gnome-doc-common
+%{__gnome_doc_common}
 %{__automake}
 %{__autoconf}
 %configure \
 	--disable-static \
-	--disable-schemas-install
+	--disable-schemas-install \
+	--enable-mini-commander \
+	--enable-stickynotes
 %{__make}
 
 %install
@@ -95,154 +347,308 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 \
+	pythondir=%{py_sitedir}
 
-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+rm -f $RPM_BUILD_ROOT%{_libdir}/libgweather.la
+rm -f $RPM_BUILD_ROOT%{py_sitedir}/invest/*.py
 
-%find_lang %{name} --with-gnome --all-name
-
-find $RPM_BUILD_ROOT/%{_pixmapsdir}/gkb/|grep '/..\.png$'|sed "s=$RPM_BUILD_ROOT\(/%{_pixmapsdir}/gkb/\)\(..\)\(.png\)=%lang(\2) \1\2\3=" >> %{name}.lang
-find . 	-name ChangeLog -o \
-	-name TODO -o \
-	-name NEWS -o \
-	-name AUTHORS \
-	-o -name README | \
-awk '{src=$0; dst=$0;sub("^./","",dst);gsub("/","-",dst);
-	print "cp " src " " dst}  END {print "exit 0"}' | sh
+mv -f $RPM_BUILD_ROOT%{_datadir}/locale/es{_ES,}/LC_MESSAGES/*.mo
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/es_ES
+[ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr@latin ] || \
+	mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
+%find_lang %{name}-2.0
+%find_lang accessx-status --with-gnome --with-omf
+%find_lang battstat --with-gnome --with-omf
+%find_lang char-palette --with-gnome --with-omf
+%find_lang command-line --with-gnome --with-omf
+%find_lang cpufreq-applet --with-gnome --with-omf
+%find_lang drivemount --with-gnome --with-omf
+%find_lang geyes --with-gnome --with-omf
+%find_lang gswitchit --with-gnome --with-omf
+%find_lang gweather --with-gnome --with-omf
+%find_lang mixer_applet2 --with-gnome --with-omf
+%find_lang multiload --with-gnome --with-omf
+%find_lang stickynotes_applet --with-gnome --with-omf
+%find_lang trashapplet --with-gnome --with-omf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-/usr/bin/scrollkeeper-update
-%gconf_schema_install
+%post accessx-status
+%scrollkeeper_update_post
+%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
+
+%postun battstat
+%scrollkeeper_update_postun
+
+%post charpicker
+%scrollkeeper_update_post
+%gconf_schema_install charpick.schemas
+%update_icon_cache hicolor
+
+%preun charpicker
+%gconf_schema_uninstall charpick.schemas
+
+%postun charpicker
+%scrollkeeper_update_postun
+%update_icon_cache hicolor
+
+%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
+%update_icon_cache hicolor
+
+%preun cpufreq
+%gconf_schema_uninstall cpufreq-applet.schemas
+
+%postun cpufreq
+%scrollkeeper_update_postun
+%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
+%update_icon_cache hicolor
+
+%preun geyes
+%gconf_schema_uninstall geyes.schemas
+
+%postun geyes
+%scrollkeeper_update_postun
+%update_icon_cache hicolor
+
+%post gweather
+/sbin/ldconfig
+%scrollkeeper_update_post
+
+%postun gweather
+/sbin/ldconfig
+%scrollkeeper_update_postun
+
+%post invest
+%scrollkeeper_update_post
+
+%postun invest
+%scrollkeeper_update_postun
+
+%post keyboard
+%scrollkeeper_update_post
+%update_icon_cache hicolor
+
+%postun keyboard
+%scrollkeeper_update_postun
+%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
+%update_icon_cache hicolor
+
+%preun minicommander
+%gconf_schema_uninstall mini-commander-global.schemas
+%gconf_schema_uninstall mini-commander.schemas
+
+%postun minicommander
+%scrollkeeper_update_postun
+%update_icon_cache hicolor
+
+%post mixer
+%scrollkeeper_update_post
+%gconf_schema_install mixer.schemas
+
+%preun mixer
+%gconf_schema_uninstall mixer.schemas
+
+%postun mixer
+%scrollkeeper_update_postun
+
+%post modemlights
+%update_icon_cache hicolor
+
+%postun modemlights
+%update_icon_cache hicolor
+
+%post multiload
+%scrollkeeper_update_post
+%gconf_schema_install multiload.schemas
 
-%postun	-p /usr/bin/scrollkeeper-update
+%preun multiload
+%gconf_schema_uninstall multiload.schemas
 
-%files -f %{name}.lang
+%postun multiload
+%scrollkeeper_update_postun
+
+%post stickynotes
+%scrollkeeper_update_post
+%gconf_schema_install stickynotes.schemas
+%update_icon_cache hicolor
+
+%preun stickynotes
+%gconf_schema_uninstall stickynotes.schemas
+
+%postun stickynotes
+%scrollkeeper_update_postun
+%update_icon_cache hicolor
+
+%post trash
+%scrollkeeper_update_post
+
+%postun trash
+%scrollkeeper_update_postun
+
+%files -f %{name}-2.0.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
+%lang(es_CL) %dir %{_datadir}/locale/es_CL
+%lang(es_CL) %dir %{_datadir}/locale/es_CL/LC_MESSAGES
+%lang(es_CO) %dir %{_datadir}/locale/es_CO
+%lang(es_CO) %dir %{_datadir}/locale/es_CO/LC_MESSAGES
+%lang(es_CR) %dir %{_datadir}/locale/es_CR
+%lang(es_CR) %dir %{_datadir}/locale/es_CR/LC_MESSAGES
+%lang(es_DO) %dir %{_datadir}/locale/es_DO
+%lang(es_DO) %dir %{_datadir}/locale/es_DO/LC_MESSAGES
+%lang(es_EC) %dir %{_datadir}/locale/es_EC
+%lang(es_EC) %dir %{_datadir}/locale/es_EC/LC_MESSAGES
+%lang(es_GT) %dir %{_datadir}/locale/es_GT
+%lang(es_GT) %dir %{_datadir}/locale/es_GT/LC_MESSAGES
+%lang(es_HN) %dir %{_datadir}/locale/es_HN
+%lang(es_HN) %dir %{_datadir}/locale/es_HN/LC_MESSAGES
+%lang(es_PA) %dir %{_datadir}/locale/es_PA
+%lang(es_PA) %dir %{_datadir}/locale/es_PA/LC_MESSAGES
+%lang(es_PE) %dir %{_datadir}/locale/es_PE
+%lang(es_PE) %dir %{_datadir}/locale/es_PE/LC_MESSAGES
+%lang(es_PR) %dir %{_datadir}/locale/es_PR
+%lang(es_PR) %dir %{_datadir}/locale/es_PR/LC_MESSAGES
+%lang(es_SV) %dir %{_datadir}/locale/es_SV
+%lang(es_SV) %dir %{_datadir}/locale/es_SV/LC_MESSAGES
+%lang(es_UY) %dir %{_datadir}/locale/es_UY
+%lang(es_UY) %dir %{_datadir}/locale/es_UY/LC_MESSAGES
+%lang(es_VE) %dir %{_datadir}/locale/es_VE
+%lang(es_VE) %dir %{_datadir}/locale/es_VE/LC_MESSAGES
+
+%files accessx-status -f accessx-status.lang
 %defattr(644,root,root,755)
-%doc *AUTHORS *ChangeLog *NEWS *README *TODO
-%{_sysconfdir}/gconf/schemas/*
-%{_sysconfdir}/sound/events/*
-%attr(755,root,root) %{_bindir}/*
+%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
+%{_iconsdir}/hicolor/48x48/apps/ax-applet.png
+
+%files battstat -f battstat.lang
+%defattr(644,root,root,755)
+%doc battstat/ChangeLog
 %attr(755,root,root) %{_libdir}/battstat-applet-2
-%attr(755,root,root) %{_libdir}/cdplayer_applet2
+%{_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
+%{_sysconfdir}/sound/events/battstat_applet.soundlist
+
+%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
+
+%files cpufreq -f cpufreq-applet.lang
+%defattr(644,root,root,755)
+%doc cpufreq/ChangeLog
+%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.*
+
+%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
+
+%files geyes -f geyes.lang
+%defattr(644,root,root,755)
+%doc geyes/ChangeLog
 %attr(755,root,root) %{_libdir}/geyes_applet2
-%attr(755,root,root) %{_libdir}/gnome-keyboard-applet
-%attr(755,root,root) %{_libdir}/gtik2_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
+
+%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}/mailcheck-applet
-%attr(755,root,root) %{_libdir}/mini_commander_applet
-%attr(755,root,root) %{_libdir}/mixer_applet2
-%attr(755,root,root) %{_libdir}/modemlights_applet2
-%attr(755,root,root) %{_libdir}/multiload-applet-2
-%attr(755,root,root) %{_libdir}/stickynotes_applet
-%attr(755,root,root) %{_libdir}/wireless-applet
-%attr(755,root,root) %{_libdir}/%{name}
-%{_libdir}/bonobo/servers/*
-%{_datadir}/battstat_applet
-%{_datadir}/geyes
-%{_datadir}/gnome/gkb/presets.xml
-%{_datadir}/gnome-2.0/ui/*
-%{_datadir}/gen_util
-%{_datadir}/gswitchit
-%{_datadir}/gweather
-%{_datadir}/stickynotes
-%{_datadir}/wireless-applet
-%{_pixmapsdir}/accessx-status-applet
-%{_pixmapsdir}/mailcheck
-%{_pixmapsdir}/mini-commander
-%{_pixmapsdir}/mixer
-%{_pixmapsdir}/stickynotes
-%{_pixmapsdir}/wireless-applet
-%{_pixmapsdir}/*.png
-%{_omf_dest_dir}/%{name}
-
-%dir %{_datadir}/gnome/gkb
-%{_datadir}/gnome/gkb/Dvorak.keyprop
-%{_datadir}/gnome/gkb/Default.keyprop
-%lang(hy) %{_datadir}/gnome/gkb/AM_Armenian.keyprop
-%lang(ar) %{_datadir}/gnome/gkb/AR_*
-%lang(hy) %{_datadir}/gnome/gkb/Armenian.keyprop
-%lang(az) %{_datadir}/gnome/gkb/AZ_Azerbaidjani_Turkic.keyprop
-%lang(eu) %{_datadir}/gnome/gkb/Basque.keyprop
-%lang(nl) %{_datadir}/gnome/gkb/BE_Dutch.keyprop
-%lang(fr,nl,wa) %{_datadir}/gnome/gkb/Belgian.keyprop
-%lang(bg) %{_datadir}/gnome/gkb/BG_*
-%lang(pt_BR) %{_datadir}/gnome/gkb/BR_*
-%lang(bg) %{_datadir}/gnome/gkb/BulgarianCyril.keyprop
-%lang(be) %{_datadir}/gnome/gkb/BY_Belarussian.keyprop
-%lang(en_CA) %{_datadir}/gnome/gkb/CA_English.keyprop
-%lang(de) %{_datadir}/gnome/gkb/CH_German_x.keyprop
-%lang(cs) %{_datadir}/gnome/gkb/CZ_Czech.keyprop
-%lang(cs) %{_datadir}/gnome/gkb/CZ_Czech_x.keyprop
-%lang(cs,sk) %{_datadir}/gnome/gkb/CZ_Czech_Slovak.keyprop
-%lang(de) %{_datadir}/gnome/gkb/DE_*
-%lang(da) %{_datadir}/gnome/gkb/DK_*
-%lang(et) %{_datadir}/gnome/gkb/EE_*
-%lang(es) %{_datadir}/gnome/gkb/ES_*
-%lang(fi) %{_datadir}/gnome/gkb/FI_*
-%lang(fr) %{_datadir}/gnome/gkb/FrenchCanadian2.keyprop
-%lang(fr) %{_datadir}/gnome/gkb/FrenchCanadian.keyprop
-%lang(fr) %{_datadir}/gnome/gkb/FrenchSwiss.keyprop
-%lang(fr) %{_datadir}/gnome/gkb/FR_*
-%lang(ka) %{_datadir}/gnome/gkb/GE_Georgian_x.keyprop
-%lang(ka) %{_datadir}/gnome/gkb/GeorgianLatin.keyprop
-%lang(de) %{_datadir}/gnome/gkb/German.keyprop
-%lang(de) %{_datadir}/gnome/gkb/GermanSwiss.keyprop
-%lang(el) %{_datadir}/gnome/gkb/GR_*
-%lang(hr) %{_datadir}/gnome/gkb/HR_*
-%lang(hu) %{_datadir}/gnome/gkb/HU_*
-%lang(hu) %{_datadir}/gnome/gkb/Hungarian*
-%lang(he,yi) %{_datadir}/gnome/gkb/IL_*
-%lang(is) %{_datadir}/gnome/gkb/IS_*
-%lang(it) %{_datadir}/gnome/gkb/IT_*
-%lang(ja) %{_datadir}/gnome/gkb/JP_*
-%lang(ko) %{_datadir}/gnome/gkb/KR_Korean.keyprop
-%lang(lo) %{_datadir}/gnome/gkb/LA_Lao_x.keyprop
-%lang(lt) %{_datadir}/gnome/gkb/LT_*
-%lang(mk) %{_datadir}/gnome/gkb/M*acedonian.keyprop
-%lang(mn) %{_datadir}/gnome/gkb/MN_Mongolian*.keyprop
-%lang(nl) %{_datadir}/gnome/gkb/NL_Dutch_x.keyprop
-%lang(nn,no) %{_datadir}/gnome/gkb/NO_Norwegian.keyprop
-%lang(nn,no) %{_datadir}/gnome/gkb/Norwegian.keyprop
-%lang(pl) %{_datadir}/gnome/gkb/*olish*
-%lang(pt) %{_datadir}/gnome/gkb/Portug*
-%lang(pt) %{_datadir}/gnome/gkb/PT_*
-%lang(ro) %{_datadir}/gnome/gkb/RO_Romanian.keyprop
-%lang(ru) %{_datadir}/gnome/gkb/*Russian*
-%lang(sv) %{_datadir}/gnome/gkb/SE_Swedish*.keyprop
-%lang(sl) %{_datadir}/gnome/gkb/SI_Slovenian*.keyprop
-%lang(sk) %{_datadir}/gnome/gkb/Slovak.keyprop
-%lang(sk) %{_datadir}/gnome/gkb/SK_*
-%lang(sl) %{_datadir}/gnome/gkb/Sloven*.keyprop
-%lang(sr) %{_datadir}/gnome/gkb/SR_Dutch.keyprop
-%lang(sv) %{_datadir}/gnome/gkb/Swedish.keyprop
-# does (sy) really exist?
-%lang(ar) %{_datadir}/gnome/gkb/Syriac*.keyprop
-%lang(th) %{_datadir}/gnome/gkb/Thai2.keyprop
-%lang(th) %{_datadir}/gnome/gkb/Thai.keyprop
-%lang(th) %{_datadir}/gnome/gkb/TH_Thai.keyprop
-%lang(th) %{_datadir}/gnome/gkb/TH_Thai_x.keyprop
-%lang(tr) %{_datadir}/gnome/gkb/TR*
-%lang(uk) %{_datadir}/gnome/gkb/UA_Ukrainian.keyprop
-%{_datadir}/gnome/gkb/UK*
-%{_datadir}/gnome/gkb/US*
-%lang(vi) %{_datadir}/gnome/gkb/VN_Vietnamese.keyprop
-%lang(hr,mk,sl,sr) %{_datadir}/gnome/gkb/Yugoslav.keyprop
-%lang(sr) %{_datadir}/gnome/gkb/YU_Serb*.keyprop
-
-%dir %{_pixmapsdir}/gkb
-%{_pixmapsdir}/gkb/gkb.png
-%{_pixmapsdir}/gkb/lam.png
+%{_libdir}/bonobo/servers/GNOME_GWeatherApplet_Factory.server
+%{_datadir}/gnome-2.0/ui/GNOME_GWeatherApplet.xml
 
+%files invest
+%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
+%{_pixmapsdir}/invest-big.png
+%dir %{py_sitedir}/invest
+%{py_sitedir}/invest/*.py[co]
+
+%files keyboard -f gswitchit.lang
+%defattr(644,root,root,755)
+%doc gswitchit/ChangeLog
+%attr(755,root,root) %{_libdir}/gnome-keyboard-applet
+%{_libdir}/bonobo/servers/GNOME_KeyboardApplet.server
 %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*
@@ -286,8 +692,62 @@ GCONF_CONFIG_SOURCE="`%{_bindir}/gconftool-2 --get-default-source`" %{_libdir}/%
 %lang(uk) %{_datadir}/xmodmap/xmodmap.uk*
 %{_datadir}/xmodmap/xmodmap.us*
 %lang(hr,mk,sl,sr) %{_datadir}/xmodmap/xmodmap.yu*
+%{_datadir}/gnome-2.0/ui/GNOME_GSwitchItApplet.xml
+%{_datadir}/%{name}/glade/gswitchit*.glade
+%{_iconsdir}/hicolor/48x48/apps/gswitchit*.png
+
+%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
+%{_iconsdir}/hicolor/48x48/apps/gnome-mini-commander.png
+%{_sysconfdir}/gconf/schemas/mini-commander-global.schemas
+%{_sysconfdir}/gconf/schemas/mini-commander.schemas
+
+%files mixer -f mixer_applet2.lang
+%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
+
+%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.*
+
+%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
+
+%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
 
-%files devel
+%files trash -f trashapplet.lang
 %defattr(644,root,root,755)
-%{_includedir}/*
-%{_pkgconfigdir}/*.pc
+%doc trashapplet/ChangeLog
+%attr(755,root,root) %{_libdir}/trashapplet
+%{_libdir}/bonobo/servers/GNOME_Panel_TrashApplet.server
+%{_datadir}/%{name}/glade/trashapplet-empty-progress.ui
+%{_datadir}/gnome-2.0/ui/GNOME_Panel_TrashApplet.xml