X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gg2.spec;h=fda3e0aaee58c27e09e344c4678bc2ca4b6f541e;hb=1436736c4499226265d63f16113eddc645667c57;hp=7298ce64ec7863aba9084745b037148048f3c7bb;hpb=1a7e7681ddee7b92cb2e32e9a0d7d184fe30aebc;p=packages%2Fgg2.git

diff --git a/gg2.spec b/gg2.spec
index 7298ce6..fda3e0a 100644
--- a/gg2.spec
+++ b/gg2.spec
@@ -1,39 +1,49 @@
 #
 # Conditional build: 
-%bcond_without	arts
-%bcond_without	perl
-%bcond_without	esd
-%bcond_without	gtkspell
+%bcond_without	arts		# without aRts sound support
+%bcond_without	esd		# without EsounD sound support
+%bcond_without	dbus		# without DBUS support
+%bcond_without	gtkspell	# without gtkspell support
+%bcond_without	xosd		# without xosd support
+%bcond_with	perl		# with perl support
 #
 Summary:	GNU Gadu 2 - free talking
 Summary(es):	GNU Gadu 2 - charlar libremente
 Summary(pl):	GNU Gadu 2 - wolne gadanie
 Name:		gg2
-Version:	2.2.0
-Release:	1
+Version:	2.2.7
+Release:	0.1
 Epoch:		3
 License:	GPL v2+
 Group:		Applications/Communications
-Source0:	http://osdn.dl.sourceforge.net/sourceforge/ggadu/%{name}-%{version}.tar.gz
-# Source0-md5:	922561225eefaf1b2c1b13d772002581
+Source0:	http://dl.sourceforge.net/ggadu/%{name}-%{version}.tar.gz
+# Source0-md5:	6e00cad44bef228e395c24a2a90da99c
 URL:		http://www.gnugadu.org/
+Patch0:		%{name}-desktop.patch
+Patch1:		%{name}-dbus.patch
 %{?with_arts:BuildRequires:	artsc-devel}
+%{?with_gtkspell:BuildRequires:	aspell-devel}
 BuildRequires:	autoconf
-BuildRequires:	automake >= 1.7
+BuildRequires:	automake >= 1:1.7
+%{?with_dbus:BuildRequires:	dbus-glib-devel >= 0.22}
 %{?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.4.0
+BuildRequires:	glib2-devel >= 2.2.0
+BuildRequires:	gtk+2-devel >= 2.4.0
+%{?with_gtkspell:BuildRequires:	gtkspell-devel}
 BuildRequires:	libtlen-devel
 BuildRequires:	libtool
-BuildRequires:	loudmouth-devel >= 0.16-4
-BuildRequires:	openssl-devel >= 0.9.7d
-%{?with_perl:BuildRequires:	perl-devel}
-%{?with_gtkspell:BuildRequires:	gtkspell-devel}
-%{?with_gtkspell:BuildRequires:	aspell-devel}
+BuildRequires:	loudmouth-devel >= 0.17.1
+BuildRequires:	gnutls-devel >= 1.2.5
 BuildRequires:	pkgconfig
-BuildRequires:	xosd-devel   >= 2.0.0
+%{?with_xosd:BuildRequires:	xosd-devel >= 2.0.0}
+%if %{with perl}
+BuildRequires:	perl-devel
+Requires:	perl(DynaLoader) = %(%{__perl} -MDynaLoader -e 'print DynaLoader->VERSION')
+%endif
 Requires:	gg2-ui
+Obsoletes:	gg-common
+Obsoletes:	gg-kde
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -74,10 +84,11 @@ Summary:	GTK+2 GUI plugin
 Summary(es):	Plugin de GUI en GTK+2
 Summary(pl):	Wtyczka z GUI w GTK+2
 Group:		Applications/Communications
-Provides:	gg2-ui
-Provides:	%{name}-gui-gtk+2 = %{epoch}:%{version}-%{release}
-Obsoletes:	%{name}-gui-gtk+2
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Provides:	gg2-ui
+Provides:	gg2-gui-gtk+2 = %{epoch}:%{version}-%{release}
+Obsoletes:	gg2-gui-gtk+2
+Obsoletes:	gg-gnome
 
 %description plugin-gui-gtk+2
 GTK+2 GUI plugin for GNU Gadu 2.
@@ -109,9 +120,9 @@ Summary:	Gadu-Gadu plugin
 Summary(es):	Plugin de Gadu-Gadu
 Summary(pl):	Wtyczka protoko³u Gadu-Gadu
 Group:		Applications/Communications
-Provides:	%{name}-gadu-gadu = %{epoch}:%{version}-%{release}
-Obsoletes:	%{name}-gadu-gadu
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Provides:	gg2-gadu-gadu = %{epoch}:%{version}-%{release}
+Obsoletes:	gg2-gadu-gadu
 
 %description plugin-gadu-gadu
 Gadu-Gadu protocol plugin.
@@ -127,9 +138,9 @@ Summary:	Tlen.pl plugin
 Summary(es):	Plugin de Tlen.pl
 Summary(pl):	Wtyczka protoko³u Tlen.pl
 Group:		Applications/Communications
-Provides:	%{name}-tlen = %{epoch}:%{version}-%{release}
-Obsoletes:	%{name}-tlen
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Provides:	gg2-tlen = %{epoch}:%{version}-%{release}
+Obsoletes:	gg2-tlen
 
 %description plugin-tlen
 Tlen.pl protocol plugin.
@@ -147,8 +158,8 @@ Summary(pl):	Wtyczka protoko
 Group:		Applications/Communications
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	loudmouth >= 0.16-4
-Provides:	%{name}-jabber = %{epoch}:%{version}-%{release}
-Obsoletes:	%{name}-jabber
+Provides:	gg2-jabber = %{epoch}:%{version}-%{release}
+Obsoletes:	gg2-jabber
 
 %description plugin-jabber
 Jabber protocol plugin.
@@ -164,9 +175,9 @@ 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
-Provides:	%{name}-sound-esd = %{epoch}:%{version}-%{release}
-Obsoletes:	%{name}-sound-esd
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Provides:	gg2-sound-esd = %{epoch}:%{version}-%{release}
+Obsoletes:	gg2-sound-esd
 
 %description plugin-sound-esd
 Sound support with ESD.
@@ -182,9 +193,9 @@ 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}-%{release}
 Provides:	%{name}-sound-oss = %{epoch}:%{version}-%{release}
 Obsoletes:	%{name}-sound-oss
-Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-sound-oss
 OSS sound support.
@@ -200,9 +211,9 @@ 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
-Provides:	%{name}-sound-external = %{epoch}:%{version}-%{release}
-Obsoletes:	%{name}-sound-external
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Provides:	gg2-sound-external = %{epoch}:%{version}-%{release}
+Obsoletes:	gg2-sound-external
 
 %description plugin-sound-external
 Sound support with external player.
@@ -218,9 +229,9 @@ 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
-Provides:	%{name}-sound-aRts = %{epoch}:%{version}-%{release}
-Obsoletes:	%{name}-sound-aRts
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Provides:	gg2-sound-aRts = %{epoch}:%{version}-%{release}
+Obsoletes:	gg2-sound-aRts
 
 %description plugin-sound-aRts
 Sound support with aRts.
@@ -236,9 +247,9 @@ 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
-Provides:	%{name}-xosd = %{epoch}:%{version}-%{release}
-Obsoletes:	%{name}-xosd
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Provides:	gg2-xosd = %{epoch}:%{version}-%{release}
+Obsoletes:	gg2-xosd
 
 %description plugin-xosd
 Support for X On Screen Display.
@@ -254,10 +265,10 @@ 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
-Provides:	%{name}-docklet-system-tray = %{epoch}:%{version}-%{release}
-Obsoletes:	%{name}-docklet-system-tray
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Obsoletes:	%{name}-docklet
+Provides:	gg2-docklet-system-tray = %{epoch}:%{version}-%{release}
+Obsoletes:	gg2-docklet-system-tray
+Obsoletes:	gg2-docklet
 
 %description plugin-docklet-system-tray
 Support for Window Managers notification areas (GNOME, KDE).
@@ -274,10 +285,12 @@ 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
+Provides:	gg2-docklet-dockapp = %{epoch}:%{version}-%{release}
+Obsoletes:	gg2-docklet-dockapp
+Obsoletes:	gg2-docklet
+Obsoletes:	gg-gnome-applet
+Obsoletes:	gg-wm-applet
 
 %description plugin-docklet-dockapp
 Support for WindowMaker-style dockapp.
@@ -293,9 +306,9 @@ Summary:	SMS Gateway
 Summary(es):	Puerta SMS
 Summary(pl):	Bramka SMS
 Group:		Applications/Communications
-Provides:	%{name}-sms = %{epoch}:%{version}-%{release}
-Obsoletes:	%{name}-sms
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Provides:	gg2-sms = %{epoch}:%{version}-%{release}
+Obsoletes:	gg2-sms
 
 %description plugin-sms
 Send SMS to cellular phones via web gateways.
@@ -307,33 +320,14 @@ Manda mensajes SMS a m
 Wtyczka wysy³aj±ca wiadomo¶ci SMS na telefony komórkowe przez bramki
 WWW.
 
-%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
-Provides:	%{name}-remote = %{epoch}:%{version}-%{release}
-Obsoletes:	%{name}-remote
-Provides:	gg2-ui
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-
-%description plugin-remote
-Make possible exchange data with other applications.
-
-%description plugin-remote -l es
-Permite intercambiar los datos con otras aplicaciones.
-
-%description plugin-remote -l pl
-Wtyczka umo¿liwiaj±ca wymianê informacji z innymi aplikacjami.
-
 %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}
+Requires:	gtk+2
+Provides:	gg2-history-external = %{epoch}:%{version}-%{release}
+Obsoletes:	gg2-history-external
 
 %description plugin-history-external
 Allow to view GNU Gadu chat history.
@@ -346,9 +340,9 @@ Summary:	Check for new GNU Gadu newer version
 Summary(es):	Verifica si hay versiones nuevas de GNU Gadu
 Summary(pl):	Sprawdzanie dostêpno¶ci nowszej wersji GNU Gadu
 Group:		Applications/Communications
-Provides:	%{name}-update = %{epoch}:%{version}-%{release}
-Obsoletes:	%{name}-update
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Provides:	gg2-update = %{epoch}:%{version}-%{release}
+Obsoletes:	gg2-update
 
 %description plugin-update
 Check for new GNU Gadu newer version.
@@ -359,13 +353,48 @@ Verifica si hay nuevas versiones de 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
+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 plugin-auto-away
+Summary:	Auto-Away Plugin
+Summary(pl):	Wtyczka automatycznego stany zajêto¶ci
+Group:		Applications/Communications
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description plugin-auto-away
+Auto-Away Plugin.
+
+%description plugin-auto-away -l pl
+Wtyczka automatycznego stany zajêto¶ci.
+
+%package plugin-ignore
+Summary:	Allow to create list of ignored contacts
+Summary(pl):	Wtyczka pozwalaj±ca stworzyæ listê kontaktów ignorowanych
+Group:		Applications/Communications
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description plugin-ignore
+Allow to create list of ignored contacts.
+
+%description plugin-ignore -l pl
+Wtyczka pozwalaj±ca stworzyæ listê kontaktów ignorowanych.
+
 %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}-%{release}
-Requires:	%{name}-gui-gtk+2
+Requires:	%{name}-gui-gtk+2 = %{epoch}:%{version}-%{release}
 
 %description themes
 Themes for GNU Gadu 2 GUI.
@@ -378,6 +407,8 @@ Motywy graficzne dla GUI GNU Gadu 2.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 %{__gettextize}
@@ -393,7 +424,7 @@ Motywy graficzne dla GUI GNU Gadu 2.
  	--with-gadu \
  	--with-tlen \
  	--with-jabber \
- 	--with-xosd \
+ 	--with%{!?with_xosd:out}-xosd \
  	--with-sms \
  	--with-docklet_system_tray \
 	--with-docklet_dockapp \
@@ -403,10 +434,13 @@ Motywy graficzne dla GUI GNU Gadu 2.
  	--with-external \
  	--with-update \
 	--with-history-external-viewer \
+	--with-aaway \
+	--with-ignore \
 	--with-gghist \
 	--with%{!?with_gtkspell:out}-gtkspell \
-	--%{?with_perl:with}%{!?with_perl:without}-perl \
- 	--with-remote
+	--with%{!?with_dbus:out}-dbus \
+	%{?with_dbus:--with-dbus-dir=%{_datadir}/dbus-1/services/} \
+	--%{?with_perl:with}%{!?with_perl:without}-perl 
 
 %{__make}
 
@@ -490,9 +524,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/gg2/libsound_arts_plugin.so
 %endif
 
+%if %{with xosd}
 %files plugin-xosd
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/gg2/libxosd_plugin.so
+%endif
 
 %files plugin-docklet-system-tray
 %defattr(644,root,root,755)
@@ -506,10 +542,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/gg2/libsms_plugin.so
 
-%files plugin-remote
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/gg2/libremote_plugin.so
-
 %files plugin-history-external
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/gghist
@@ -519,6 +551,21 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/gg2/libupdate_plugin.so
 
+%files plugin-auto-away
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/gg2/libaaway_plugin.so
+
+%files plugin-ignore
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/gg2/libignore_main_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/services/org.freedesktop.im.GG.service
+%endif
+
 %files themes
 %defattr(644,root,root,755)
 %dir %{_datadir}/gg2/themes
@@ -529,7 +576,6 @@ rm -rf $RPM_BUILD_ROOT
 %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
@@ -540,4 +586,3 @@ 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-classic/*.png