X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gg2.spec;h=44c9b44efab44041076e50aa37795d8b5b4ef0ba;hb=5985e9fc1f6837da6e9fc4c1994ba78fe67bf149;hp=33b0de3cabc85d6572b91256679b749fd9286f5a;hpb=8c2e46a9878362deaf6a97b8e6ab321095c3fc65;p=packages%2Fgg2.git

diff --git a/gg2.spec b/gg2.spec
index 33b0de3..44c9b44 100644
--- a/gg2.spec
+++ b/gg2.spec
@@ -1,44 +1,43 @@
-
-%bcond_with	arts
+#
+# Conditional build: 
+%bcond_without	arts
 %bcond_without	perl
 %bcond_without	esd
-
-%define		_snap	20031117
+%bcond_without	gtkspell
+#
 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}.2
-Epoch:		2
+Version:	2.0.6
+Release:	1
+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:	ed977cb5bc00b37c9ceaece94f785b65
+URL:		http://www.gnugadu.org/
+%{?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 >= 4:1.4
+BuildRequires:	gtk+2-devel  >= 2.4.0
 BuildRequires:	libtlen-devel
 BuildRequires:	libtool
-BuildRequires:	loudmouth-devel >= 0.13.1
+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:	pkgconfig
 BuildRequires:	xosd-devel   >= 2.0.0
-%{?with_arts:BuildRequires:	arts-devel}
-%{?with_perl:BuildRequires:	perl-devel}
+Requires:	gg2-ui
 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 +53,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
 
@@ -75,7 +74,8 @@ 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
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description gui-gtk+2
 GTK+2 GUI plugin for GNU Gadu 2.
@@ -91,7 +91,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.
@@ -107,7 +107,7 @@ Summary:	Gadu-Gadu plugin
 Summary(es):	Plugin de Gadu-Gadu
 Summary(pl):	Wtyczka protoko³u Gadu-Gadu
 Group:		Applications/Communications
-Requires:	%{name} = %{epoch}:%{version}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description gadu-gadu
 Gadu-Gadu protocol plugin.
@@ -123,7 +123,7 @@ Summary:	Tlen.pl plugin
 Summary(es):	Plugin de Tlen.pl
 Summary(pl):	Wtyczka protoko³u Tlen.pl
 Group:		Applications/Communications
-Requires:	%{name} = %{epoch}:%{version}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description tlen
 Tlen.pl protocol plugin.
@@ -139,7 +139,8 @@ 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
 
 %description jabber
 Jabber protocol plugin.
@@ -150,13 +151,12 @@ Un plugin para el protocolo Jabber.
 %description jabber -l pl
 Wtyczka protoko³u Jabber.
 
-%if %{with esd}
 %package 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}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description sound-esd
 Sound support with ESD.
@@ -166,14 +166,13 @@ Soporte de sonido a trav
 
 %description sound-esd -l pl
 Obs³uga d¼wiêku poprzez ESD.
-%endif
 
 %package 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}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description sound-oss
 OSS sound support.
@@ -189,7 +188,7 @@ 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}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description sound-external
 Sound support with external player.
@@ -200,7 +199,6 @@ Soporte de sonido a trav
 %description sound-external -l pl
 Obs³uga d¼wiêku przez zewnêtrzny program.
 
-%if %{with arts}
 %package sound-aRts
 Summary:	Sound support with aRts
 Summary(es):	Soporte de sonido a través de aRts
@@ -216,14 +214,13 @@ Soporte de sonido a trav
 
 %description sound-aRts -l pl
 Obs³uga d¼wiêku poprzez aRts.
-%endif
 
 %package 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}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description xosd
 Support for X On Screen Display.
@@ -239,11 +236,11 @@ 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}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 Obsoletes:	%{name}-docklet
 
 %description docklet-system-tray
-Support for Window Managers nofinication areas (GNOME, KDE).
+Support for Window Managers notification areas (GNOME, KDE).
 
 %description docklet-system-tray -l es
 Soporte para áreas de notificación de los Manejantes de Ventanas
@@ -252,12 +249,29 @@ Soporte para 
 %description docklet-system-tray -l pl
 Obs³uga obszarów powiadomieñ w ró¿nych zarz±dcach okien (GNOME, KDE).
 
+%package 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
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Obsoletes:	%{name}-docklet
+
+%description docklet-dockapp
+Support for WindowMaker-style dockapp.
+
+%description docklet-dockapp -l es
+Suporte de dockapp estilo WindowMaker.
+
+%description docklet-dockapp -l pl
+Obs³uga dokowalnego apletu zgodnego z WindowMakerem.
+
 %package sms
 Summary:	SMS Gateway
 Summary(es):	Puerta SMS
 Summary(pl):	Bramka SMS
 Group:		Applications/Communications
-Requires:	%{name} = %{epoch}:%{version}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description sms
 Send SMS to cellular phones via web gateways.
@@ -266,14 +280,16 @@ Send SMS to cellular phones via web gateways.
 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.
+Wtyczka wysy³aj±ca wiadomo¶ci SMS na telefony komórkowe przez bramki
+WWW.
 
 %package 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:	gg2-ui
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description remote
 Make possible exchange data with other applications.
@@ -281,15 +297,30 @@ Make possible exchange data with other applications.
 %description remote -l es
 Permite intercambiar los datos con otras aplicaciones.
 
+
 %description remote -l pl
 Wtyczka umo¿liwiaj±ca wymianê informacji z innymi aplikacjami.
 
+
+%package history-external
+Summary:	Allow to view GNU Gadu chat history
+Summary(pl):	Pozwala przegl±daæ historiê rozmów GNU Gadu.
+Group:		Applications/Communications
+Requires:	gtk+2
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description history-external
+Allow to view GNU Gadu chat history
+
+%description history-external -l pl
+Pozwala przegl±daæ historiê rozmów GNU Gadu.
+
 %package 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
 Group:		Applications/Communications
-Requires:	%{name} = %{epoch}:%{version}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description update
 Check for new GNU Gadu newer version.
@@ -305,7 +336,7 @@ 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 +349,13 @@ Temas para el GUI de GNU Gadu 2.
 Motywy graficzne dla GUI GNU Gadu 2.
 
 %prep
-%setup -q -n %{name}-%{version}-%{_snap}
-%patch0 -p1
+%setup -q
 
 %build
 rm -f missing
-intltoolize --copy --force
+%{__gettextize}
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I src/plugins/gadu_gadu/libgadu/m4
 %{__automake}
 %{__autoconf}
 
@@ -339,12 +369,16 @@ 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_perl:with}%{!?with_perl:without}-perl \
  	--with-remote
 
 %{__make}
@@ -356,10 +390,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
 
@@ -398,7 +429,7 @@ 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
 %defattr(644,root,root,755)
@@ -440,6 +471,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/gg2/libdocklet_system_tray_plugin.so
 
+%files docklet-dockapp
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/gg2/libdocklet_dockapp_plugin.so
+
 %files sms
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/gg2/libsms_plugin.so
@@ -448,6 +483,11 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/gg2/libremote_plugin.so
 
+%files history-external
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/gghist
+%attr(755,root,root) %{_libdir}/gg2/libhistory_external_plugin.so
+
 %files update
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/gg2/libupdate_plugin.so
@@ -461,6 +501,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 +513,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