X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gg2.spec;h=899c3f1fc18def842b18dde7bb2c842808bd2307;hb=34536057e86a3a99f9c636a5e8ad021fe898d2cb;hp=b3e9022d7542e632b6f5b1d2427967284f66be6b;hpb=fd482edbf62c5945fa5c9a132ef1edd5334da69c;p=packages%2Fgg2.git

diff --git a/gg2.spec b/gg2.spec
index b3e9022..899c3f1 100644
--- a/gg2.spec
+++ b/gg2.spec
@@ -1,44 +1,47 @@
-
-%bcond_with	arts
+#
+# Conditional build: 
+%bcond_without	arts
 %bcond_without	perl
 %bcond_without	esd
-
-%define		_snap	20031117
+%bcond_without	gtkspell
+%bcond_without	dbus
+#
 Summary:	GNU Gadu 2 - free talking
 Summary(es):	GNU Gadu 2 - charlar libremente
 Summary(pl):	GNU Gadu 2 - wolne gadanie
 Name:		gg2
-Version:	2.0
-Release:	2.%{_snap}.1
-Epoch:		2
+Version:	2.2.3
+Release:	2
+Epoch:		3
 License:	GPL v2+
 Group:		Applications/Communications
-#Source0:	http://dl.sourceforge.net/sourceforge/ggadu/%{name}-%{version}-%{_snap}.tar.gz
-Source0:	ftp://distfiles.pld-linux.org/src/%{name}-%{version}-%{_snap}.tar.gz
-# Source0-md5:	c105e95d740323feb14d726f07523bd1
-Source1:	%{name}.desktop
-Patch0:		%{name}-typo.patch
-URL:		http://www.gadu.gnu.pl/
-BuildRequires:	perl-devel
+Source0:	http://osdn.dl.sourceforge.net/sourceforge/ggadu/%{name}-%{version}.tar.gz
+# Source0-md5:	5d38e161612307ea2a7a00f9453678e3
+URL:		http://www.gnugadu.org/
+Patch0:		%{name}-desktop.patch
+%{?with_arts:BuildRequires:	artsc-devel}
 BuildRequires:	autoconf
 BuildRequires:	automake >= 1.7
 %{?with_esd:BuildRequires:	esound-devel >= 0.2.7}
 BuildRequires:	gettext-devel >= 0.11.0
 BuildRequires:	glib2-devel  >= 2.2.0
-BuildRequires:	gtk+2-devel  >= 2.2.0
-BuildRequires:	intltool
-BuildRequires:	libgadu-devel >= 1.3.1
+BuildRequires:	gtk+2-devel  >= 2.4.0
 BuildRequires:	libtlen-devel
 BuildRequires:	libtool
-BuildRequires:	loudmouth-devel >= 0.13.1
+BuildRequires:	loudmouth-devel >= 0.17.1
+BuildRequires:	openssl-devel >= 0.9.7d
+%{?with_dbus:BuildRequires:	dbus-libs >= 0.22}
+%{?with_perl:BuildRequires:	perl-devel}
+%{?with_gtkspell:BuildRequires:	gtkspell-devel}
+%{?with_gtkspell:BuildRequires:	aspell-devel}
 BuildRequires:	pkgconfig
 BuildRequires:	xosd-devel   >= 2.0.0
-%{?with_arts:BuildRequires:	arts-devel}
-%{?with_perl:BuildRequires:	perl-devel}
+Requires:	gg2-ui
+Requires:	perl(DynaLoader) = %(%{__perl} -MDynaLoader -e 'print DynaLoader->VERSION')
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-Gadu-Gadu, Tlen.pl and others instant messanger client with
+Gadu-Gadu, Tlen.pl and others instant messenger client with
 GTK+2 GUI on GNU/GPL.
 
 %description -l es
@@ -54,7 +57,7 @@ Summary:	Headers for libgg2_core library to develop plugins
 Summary(es):	Cabeceras para la biblioteca libgg2_core para desarrollar plugins
 Summary(pl):	Pliki nag³ówkowe biblioteki libgg2_core potrzebne do rozwijania wtyczek
 Group:		Applications/Communications
-Requires:	%{name} = %{epoch}:%{version}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	glib2-devel
 Requires:	perl-devel
 
@@ -70,20 +73,23 @@ libgg2_core necesarios para desarrollar plugins para GNU Gadu 2.
 Ten pakiet zawiera pliki nag³ówkowe biblioteki libgg2_core, potrzebne
 do rozwijania wtyczek do GNU Gadu 2.
 
-%package gui-gtk+2
+%package plugin-gui-gtk+2
 Summary:	GTK+2 GUI plugin
 Summary(es):	Plugin de GUI en GTK+2
 Summary(pl):	Wtyczka z GUI w GTK+2
 Group:		Applications/Communications
-Requires:	%{name} = %{epoch}:%{version}
+Provides:	gg2-ui
+Provides:	%{name}-gui-gtk+2 = %{epoch}:%{version}-%{release}
+Obsoletes:	%{name}-gui-gtk+2
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 
-%description gui-gtk+2
+%description plugin-gui-gtk+2
 GTK+2 GUI plugin for GNU Gadu 2.
 
-%description gui-gtk+2 -l es
+%description plugin-gui-gtk+2 -l es
 Un plugin con un GUI en GTK+2 para GNU Gadu 2.
 
-%description gui-gtk+2 -l pl
+%description plugin-gui-gtk+2 -l pl
 Wtyczka z GUI w GTK+2 do GNU Gadu 2.
 
 %package emoticons
@@ -91,7 +97,7 @@ Summary:	Emoticons
 Summary(es):	Emoticons
 Summary(pl):	Emotikony
 Group:		Applications/Communications
-Requires:	%{name} = %{epoch}:%{version}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description emoticons
 Emotions icons and description files.
@@ -102,210 +108,281 @@ Iconas de emociones y sus ficheros de descripci
 %description emoticons -l pl
 Zestaw ikon z emotikonami, oraz plikiem konfiguracyjnym.
 
-%package gadu-gadu
+%package plugin-gadu-gadu
 Summary:	Gadu-Gadu plugin
 Summary(es):	Plugin de Gadu-Gadu
 Summary(pl):	Wtyczka protoko³u Gadu-Gadu
 Group:		Applications/Communications
-Requires:	%{name} = %{epoch}:%{version}
+Provides:	%{name}-gadu-gadu = %{epoch}:%{version}-%{release}
+Obsoletes:	%{name}-gadu-gadu
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 
-%description gadu-gadu
+%description plugin-gadu-gadu
 Gadu-Gadu protocol plugin.
 
-%description gadu-gadu -l es
+%description plugin-gadu-gadu -l es
 Un plugin para el protocolo Gadu-Gadu.
 
-%description gadu-gadu -l pl
+%description plugin-gadu-gadu -l pl
 Wtyczka protoko³u Gadu-Gadu.
 
-%package tlen
+%package plugin-tlen
 Summary:	Tlen.pl plugin
 Summary(es):	Plugin de Tlen.pl
 Summary(pl):	Wtyczka protoko³u Tlen.pl
 Group:		Applications/Communications
-Requires:	%{name} = %{epoch}:%{version}
+Provides:	%{name}-tlen = %{epoch}:%{version}-%{release}
+Obsoletes:	%{name}-tlen
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 
-%description tlen
+%description plugin-tlen
 Tlen.pl protocol plugin.
 
-%description tlen -l es
+%description plugin-tlen -l es
 Un plugin para el protocolo Tlen.pl.
 
-%description tlen -l pl
+%description plugin-tlen -l pl
 Wtyczka protoko³u Tlen.pl.
 
-%package jabber
+%package plugin-jabber
 Summary:	Jabber.org plugin
 Summary(es):	Plugin de Jabber.org
 Summary(pl):	Wtyczka protoko³u Jabber
 Group:		Applications/Communications
-Requires:	%{name} = %{epoch}:%{version}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	loudmouth >= 0.16-4
+Provides:	%{name}-jabber = %{epoch}:%{version}-%{release}
+Obsoletes:	%{name}-jabber
 
-%description jabber
+%description plugin-jabber
 Jabber protocol plugin.
 
-%description jabber -l es
+%description plugin-jabber -l es
 Un plugin para el protocolo Jabber.
 
-%description jabber -l pl
+%description plugin-jabber -l pl
 Wtyczka protoko³u Jabber.
 
-%if %{with esd}
-%package sound-esd
+%package plugin-sound-esd
 Summary:	Sound support with ESD
 Summary(es):	Soporte de sonido a través de ESD
 Summary(pl):	Obs³uga d¼wiêku poprzez ESD
 Group:		Applications/Communications
-Requires:	%{name} = %{epoch}:%{version}
+Provides:	%{name}-sound-esd = %{epoch}:%{version}-%{release}
+Obsoletes:	%{name}-sound-esd
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 
-%description sound-esd
+%description plugin-sound-esd
 Sound support with ESD.
 
-%description sound-esd -l es
+%description plugin-sound-esd -l es
 Soporte de sonido a través de ESD.
 
-%description sound-esd -l pl
+%description plugin-sound-esd -l pl
 Obs³uga d¼wiêku poprzez ESD.
-%endif
 
-%package sound-oss
+%package plugin-sound-oss
 Summary:	OSS sound support
 Summary(es):	Soporte de sonido a través de OSS
 Summary(pl):	Obs³uga d¼wiêku OSS
 Group:		Applications/Communications
-Requires:	%{name} = %{epoch}:%{version}
+Provides:	%{name}-sound-oss = %{epoch}:%{version}-%{release}
+Obsoletes:	%{name}-sound-oss
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 
-%description sound-oss
+%description plugin-sound-oss
 OSS sound support.
 
-%description sound-oss -l es
+%description plugin-sound-oss -l es
 Soporte de sonido a través de OSS.
 
-%description sound-oss -l pl
+%description plugin-sound-oss -l pl
 Obs³uga d¼wiêku OSS.
 
-%package sound-external
+%package plugin-sound-external
 Summary:	Sound support with external player
 Summary(es):	Soporte de sonido vía un reproductor externo
 Summary(pl):	Obs³uga d¼wiêku przez zewnêtrzny program
 Group:		Applications/Communications
-Requires:	%{name} = %{epoch}:%{version}
+Provides:	%{name}-sound-external = %{epoch}:%{version}-%{release}
+Obsoletes:	%{name}-sound-external
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 
-%description sound-external
+%description plugin-sound-external
 Sound support with external player.
 
-%description sound-external -l es
+%description plugin-sound-external -l es
 Soporte de sonido a través de un reproductor externo.
 
-%description sound-external -l pl
+%description plugin-sound-external -l pl
 Obs³uga d¼wiêku przez zewnêtrzny program.
 
-%if %{with arts}
-%package sound-aRts
+%package plugin-sound-aRts
 Summary:	Sound support with aRts
 Summary(es):	Soporte de sonido a través de aRts
 Summary(pl):	Obs³uga d¼wiêku poprzez aRts
 Group:		Applications/Communications
-Requires:	%{name} = %{version}
+Provides:	%{name}-sound-aRts = %{epoch}:%{version}-%{release}
+Obsoletes:	%{name}-sound-aRts
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 
-%description sound-aRts
+%description plugin-sound-aRts
 Sound support with aRts.
 
-%description sound-aRts -l es
+%description plugin-sound-aRts -l es
 Soporte de sonido a través de aRts.
 
-%description sound-aRts -l pl
+%description plugin-sound-aRts -l pl
 Obs³uga d¼wiêku poprzez aRts.
-%endif
 
-%package xosd
+%package plugin-xosd
 Summary:	Support for X On Screen Display
 Summary(es):	Soporte para plasmar mensajes sobre el fondo de X
 Summary(pl):	Wy¶wietlanie komunikatów na ekranie X
 Group:		Applications/Communications
-Requires:	%{name} = %{epoch}:%{version}
+Provides:	%{name}-xosd = %{epoch}:%{version}-%{release}
+Obsoletes:	%{name}-xosd
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 
-%description xosd
+%description plugin-xosd
 Support for X On Screen Display.
 
-%description xosd -l es
+%description plugin-xosd -l es
 Soporte para plasmar mensajes sobre el fondo (XOSD).
 
-%description xosd -l pl
+%description plugin-xosd -l pl
 Wy¶wietlanie komunikatów na ekranie X.
 
-%package docklet-system-tray
+%package plugin-docklet-system-tray
 Summary:	Support for Window Managers notification areas
 Summary(es):	Soporte para áreas de notificación de los Manejantes de Ventanas
 Summary(pl):	Obs³uga obszarów powiadomieñ w ró¿nych zarz±dcach okien
 Group:		Applications/Communications
-Requires:	%{name} = %{epoch}:%{version}
+Provides:	%{name}-docklet-system-tray = %{epoch}:%{version}-%{release}
+Obsoletes:	%{name}-docklet-system-tray
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 Obsoletes:	%{name}-docklet
 
-%description docklet-system-tray
-Support for Window Managers nofinication areas (GNOME, KDE).
+%description plugin-docklet-system-tray
+Support for Window Managers notification areas (GNOME, KDE).
 
-%description docklet-system-tray -l es
+%description plugin-docklet-system-tray -l es
 Soporte para áreas de notificación de los Manejantes de Ventanas
 (GNOME, KDE).
 
-%description docklet-system-tray -l pl
+%description plugin-docklet-system-tray -l pl
 Obs³uga obszarów powiadomieñ w ró¿nych zarz±dcach okien (GNOME, KDE).
 
-%package sms
+%package plugin-docklet-dockapp
+Summary:	Support for WindowMaker-style dockapp
+Summary(es):	Soporte de dockapp estilo WindowMaker
+Summary(pl):	Obs³uga dokowalnego apletu zgodnego z WindowMakerem
+Group:		Applications/Communications
+Provides:	%{name}-docklet-dockapp = %{epoch}:%{version}-%{release}
+Obsoletes:	%{name}-docklet-dockapp
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Obsoletes:	%{name}-docklet
+
+%description plugin-docklet-dockapp
+Support for WindowMaker-style dockapp.
+
+%description plugin-docklet-dockapp -l es
+Suporte de dockapp estilo WindowMaker.
+
+%description plugin-docklet-dockapp -l pl
+Obs³uga dokowalnego apletu zgodnego z WindowMakerem.
+
+%package plugin-sms
 Summary:	SMS Gateway
 Summary(es):	Puerta SMS
 Summary(pl):	Bramka SMS
 Group:		Applications/Communications
-Requires:	%{name} = %{epoch}:%{version}
+Provides:	%{name}-sms = %{epoch}:%{version}-%{release}
+Obsoletes:	%{name}-sms
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 
-%description sms
+%description plugin-sms
 Send SMS to cellular phones via web gateways.
 
-%description sms -l es
+%description plugin-sms -l es
 Manda mensajes SMS a móviles vía puertas del Web.
 
-%description sms -l pl
-Wtyczka wysy³aj±ca wiadomo¶ci SMS na telefony komórkowe przez bramki WWW.
+%description plugin-sms -l pl
+Wtyczka wysy³aj±ca wiadomo¶ci SMS na telefony komórkowe przez bramki
+WWW.
 
-%package remote
+%package plugin-remote
 Summary:	Remote access from other applications
 Summary(es):	Acceso remoto desde otras aplicaciones
 Summary(pl):	Dostêp do programu z innych aplikacji
 Group:		Applications/Communications
-Requires:	%{name} = %{epoch}:%{version}
+Provides:	%{name}-remote = %{epoch}:%{version}-%{release}
+Obsoletes:	%{name}-remote
+#Provides:	gg2-ui
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 
-%description remote
+%description plugin-remote
 Make possible exchange data with other applications.
 
-%description remote -l es
+%description plugin-remote -l es
 Permite intercambiar los datos con otras aplicaciones.
 
-%description remote -l pl
+%description plugin-remote -l pl
 Wtyczka umo¿liwiaj±ca wymianê informacji z innymi aplikacjami.
 
-%package update
+%package plugin-history-external
+Summary:	Allow to view GNU Gadu chat history
+Summary(pl):	Przegl±danie historii rozmów GNU Gadu
+Group:		Applications/Communications
+Provides:	%{name}-history-external = %{epoch}:%{version}-%{release}
+Obsoletes:	%{name}-history-external
+Requires:	gtk+2
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description plugin-history-external
+Allow to view GNU Gadu chat history.
+
+%description plugin-history-external -l pl
+Wtyczka pozwalaj±ca przegl±daæ historiê rozmów GNU Gadu.
+
+%package plugin-update
 Summary:	Check for new GNU Gadu newer version
 Summary(es):	Verifica si hay versiones nuevas de GNU Gadu
-Summary(pl):	Sprawdza czy jest dostêpna nowsza wersja GNU Gadu
+Summary(pl):	Sprawdzanie dostêpno¶ci nowszej wersji GNU Gadu
 Group:		Applications/Communications
-Requires:	%{name} = %{epoch}:%{version}
+Provides:	%{name}-update = %{epoch}:%{version}-%{release}
+Obsoletes:	%{name}-update
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 
-%description update
+%description plugin-update
 Check for new GNU Gadu newer version.
 
-%description update -l es
+%description plugin-update -l es
 Verifica si hay nuevas versiones de GNU Gadu.
 
-%description update -l pl
-Sprawdza czy jest dostêpna nowsza wersja GNU Gadu
+%description plugin-update -l pl
+Wtyczka sprawdzaj±ca, czy jest dostêpna nowsza wersja GNU Gadu.
+
+%package plugin-dbus
+Summary:	Allow to communicate using D-BUS message bus
+Summary(pl):	Komunikacja za pomoc± magistrali D-BUS
+Group:		Applications/Communications
+Provides:	%{name}-update = %{epoch}:%{version}-%{release}
+Obsoletes:	%{name}-update
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description plugin-dbus
+This plugin allows to communicate using D-BUS interface.
+
+%description plugin-dbus -l pl
+Wtyczka pozwala na komunikacjê za pomoc± magistrali D-BUS.
 
 %package themes
 Summary:	Themes for GNU Gadu 2 GUI
 Summary(es):	Temas para el GUI de GNU Gadu 2
 Summary(pl):	Motywy graficzne dla GUI GNU Gadu 2
 Group:		Applications/Communications
-Requires:	%{name} = %{epoch}:%{version}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	%{name}-gui-gtk+2
 
 %description themes
@@ -318,14 +395,13 @@ Temas para el GUI de GNU Gadu 2.
 Motywy graficzne dla GUI GNU Gadu 2.
 
 %prep
-%setup -q -n %{name}-%{version}-%{_snap}
+%setup -q
 %patch0 -p1
 
 %build
-rm -f missing
-intltoolize --copy --force
+%{__gettextize}
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I src/plugins/gadu_gadu/libgadu/m4
 %{__automake}
 %{__autoconf}
 
@@ -339,12 +415,18 @@ intltoolize --copy --force
  	--with-xosd \
  	--with-sms \
  	--with-docklet_system_tray \
-	--%{?with_esd:with}%{?!with_esd:without}-esd \
+	--with-docklet_dockapp \
+	--with%{!?with_esd:out}-esd \
+	--with%{!?with_arts:out}-arts \
  	--with-oss \
  	--with-external \
  	--with-update \
-	--%{?with_arts:with}%{?!with_arts:without}-arts \
-	--%{?with_perl:enable}%{?!with_perl:disable}-perl \
+	--with-history-external-viewer \
+	--with-gghist \
+	--with%{!?with_gtkspell:out}-gtkspell \
+	--with%{!?with_dbus:out}-dbus \
+	%{?with_dbus:--with-dbus-dir=%{_datadir}/dbus-1.0/services/} \
+	--%{?with_perl:with}%{!?with_perl:without}-perl \
  	--with-remote
 
 %{__make}
@@ -356,10 +438,7 @@ rm -rf $RPM_BUILD_ROOT
 	DESTDIR=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_desktopdir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
-install -d $RPM_BUILD_ROOT%{_pixmapsdir}
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/sounds
-install $RPM_BUILD_ROOT%{_datadir}/%{name}/pixmaps/icon.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
+install gg2.desktop $RPM_BUILD_ROOT%{_desktopdir}/gg2.desktop
 
 %find_lang %{name} --all-name --with-gnome
 
@@ -379,7 +458,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/gg2
 %{_datadir}/%{name}/sounds
 
-%files gui-gtk+2
+%files plugin-gui-gtk+2
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/gg2/libGUI_plugin.so
 %dir %{_datadir}/gg2
@@ -398,60 +477,76 @@ rm -rf $RPM_BUILD_ROOT
 
 %files emoticons
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_datadir}/gg2/pixmaps/emoticons
+%{_datadir}/gg2/pixmaps/emoticons
 
-%files gadu-gadu
+%files plugin-gadu-gadu
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/gg2/libgadu_gadu_plugin.so
 
-%files tlen
+%files plugin-tlen
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/gg2/libtlen_plugin.so
 
-%files jabber
+%files plugin-jabber
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/gg2/libjabber_plugin.so
 
 %if %{with esd}
-%files sound-esd
+%files plugin-sound-esd
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/gg2/libsound_esd_plugin.so
 %endif
 
-%files sound-oss
+%files plugin-sound-oss
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/gg2/libsound_oss_plugin.so
 
-%files sound-external
+%files plugin-sound-external
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/gg2/libsound_external_plugin.so
 
 %if %{with arts}
-%files sound-aRts
+%files plugin-sound-aRts
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/gg2/libsound_arts_plugin.so
 %endif
 
-%files xosd
+%files plugin-xosd
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/gg2/libxosd_plugin.so
 
-%files docklet-system-tray
+%files plugin-docklet-system-tray
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/gg2/libdocklet_system_tray_plugin.so
 
-%files sms
+%files plugin-docklet-dockapp
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/gg2/libdocklet_dockapp_plugin.so
+
+%files plugin-sms
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/gg2/libsms_plugin.so
 
-%files remote
+%files plugin-remote
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/gg2/libremote_plugin.so
 
-%files update
+%files plugin-history-external
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/gghist
+%attr(755,root,root) %{_libdir}/gg2/libhistory_external_plugin.so
+
+%files plugin-update
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/gg2/libupdate_plugin.so
 
+%if %{with dbus}
+%files plugin-dbus
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/gg2/libdbus_plugin.so
+%{_datadir}/dbus-1.0/services/org.freedesktop.im.GG.service
+%endif
+
 %files themes
 %defattr(644,root,root,755)
 %dir %{_datadir}/gg2/themes
@@ -461,6 +556,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/gg2/pixmaps/icons/classic
 %dir %{_datadir}/gg2/pixmaps/icons/modern
 %dir %{_datadir}/gg2/pixmaps/icons/rozgwiazda
+%dir %{_datadir}/gg2/pixmaps/icons/ghosts
+%dir %{_datadir}/gg2/pixmaps/icons/tlen-classic
 %{_datadir}/gg2/pixmaps/icons/bubble/*.png
 %{_datadir}/gg2/pixmaps/icons/bubble/README
 %{_datadir}/gg2/pixmaps/icons/classic/*.png
@@ -471,5 +568,4 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gg2/pixmaps/icons/rozgwiazda/license.txt
 %{_datadir}/gg2/pixmaps/icons/ghosts/*.png
 %{_datadir}/gg2/pixmaps/icons/ghosts/README
-%{_datadir}/gg2/pixmaps/icons/tlen-3d/README
-%{_datadir}/gg2/pixmaps/icons/tlen-3d/*.png
+%{_datadir}/gg2/pixmaps/icons/tlen-classic/*.png