X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gg2.spec;h=24f7922b3f5bac62968e569b4c439f0286c2b2b4;hb=30e354ee66f0492d2ec8971f505330057c413c86;hp=f53208d8e6b337eb2c938e154038fe3d2721c7ba;hpb=bb7c9cbb36ea579c6bd366a954ef4773bf62e8e4;p=packages%2Fgg2.git

diff --git a/gg2.spec b/gg2.spec
index f53208d..24f7922 100644
--- a/gg2.spec
+++ b/gg2.spec
@@ -3,21 +3,20 @@
 %bcond_with	arts
 %bcond_without	perl
 %bcond_without	esd
+%bcond_without	gtkspell
 #
-%define		_pre	pre4
 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:	0.%{_pre}.1
+Version:	2.0.1
+Release:	1
 Epoch:		3
 License:	GPL v2+
 Group:		Applications/Communications
-#Source0:	http://gg.tiwek.com/gg2/snapshots/%{name}-%{_snap}.tar.bz2
-Source0:	http://dl.sourceforge.net/ggadu/%{name}-%{version}%{_pre}.tar.bz2
-# Source0-md5:	f7b012a5e301c0f0d96738b1d078e4c7
-URL:		http://www.gadu.gnu.pl/
+Source0:	http://dl.sourceforge.net/ggadu/%{name}-%{version}.tar.bz2
+# Source0-md5:	91a94c3bc5a6744353fe3683c73c29bd
+URL:		http://www.gnugadu.org/
 %{?with_arts:BuildRequires:	arts-devel}
 BuildRequires:	autoconf
 BuildRequires:	automake >= 1.7
@@ -25,19 +24,20 @@ BuildRequires:	automake >= 1.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:	libtlen-devel
 BuildRequires:	libtool
-BuildRequires:	loudmouth-devel >= 0.13.1
-BuildRequires:	openssl-devel
+BuildRequires:	loudmouth-devel >= 0.15.1
+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
+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
@@ -74,6 +74,7 @@ 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
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description gui-gtk+2
@@ -286,6 +287,7 @@ 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:	gg2-ui
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description remote
@@ -331,13 +333,13 @@ Temas para el GUI de GNU Gadu 2.
 Motywy graficzne dla GUI GNU Gadu 2.
 
 %prep
-%setup -q -n %{name}-%{version}%{_pre}
+%setup -q -n %{name}-%{version}
 
 %build
 rm -f missing
-intltoolize --copy --force
+%{__gettextize}
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I src/plugins/gadu_gadu/libgadu/m4
 %{__automake}
 %{__autoconf}
 
@@ -357,7 +359,8 @@ intltoolize --copy --force
  	--with-external \
  	--with-update \
 	--with%{!?with_arts:out}-arts \
-	--%{?with_perl:enable}%{!?with_perl:disable}-perl \
+	--with%{!?with_gtkspell:out}-gtkspell \
+	--%{?with_perl:with}%{!?with_perl:without}-perl \
  	--with-remote
 
 %{__make}
@@ -369,10 +372,7 @@ rm -rf $RPM_BUILD_ROOT
 	DESTDIR=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_desktopdir}
-install gg2.desktop $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
 
@@ -411,7 +411,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)