X-Git-Url: http://git.pld-linux.org/?p=packages%2Fgajim.git;a=blobdiff_plain;f=gajim.spec;h=873a3746181f4ce65dd30d23c12a671ad525d0c9;hp=604c78c716543cd85444c39942da8074faab8af3;hb=8da50e8ca878cd490769a1b6adc6ff695d5c7366;hpb=f65baddf8250a63b428146428ae24866a1a8557e

diff --git a/gajim.spec b/gajim.spec
index 604c78c..873a374 100644
--- a/gajim.spec
+++ b/gajim.spec
@@ -1,15 +1,13 @@
 Summary:	A Jabber client written in PyGTK
 Summary(pl.UTF-8):	Klient Jabbera napisany w PyGTK
 Name:		gajim
-Version:	0.11.1
-Release:	3
+Version:	0.15
+Release:	1
 Epoch:		1
-License:	GPL v2
+License:	GPL v3+
 Group:		Applications/Communications
-Source0:	http://www.gajim.org/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5:	cc587e7617f53ae8d5e0b30d7324e89c
-Patch0:		%{name}-desktop.patch
-Patch1:		%{name}-metacontact.patch
+Source0:	http://gajim.org/downloads/0.15/%{name}-%{version}.tar.bz2
+# Source0-md5:	22bc064cb35c36b4b65c40cd9b2338eb
 URL:		http://www.gajim.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -17,22 +15,38 @@ BuildRequires:	gettext-devel
 BuildRequires:	gtkspell-devel
 BuildRequires:	intltool
 BuildRequires:	libtool
+BuildRequires:	pkgconfig
 BuildRequires:	python-pygtk-devel >= 2.8.0
-BuildRequires:	rpmbuild(macros) >= 1.177
 BuildRequires:	rpm-pythonprov
+BuildRequires:	rpmbuild(macros) >= 1.177
+BuildRequires:	xorg-lib-libSM-devel
 BuildRequires:	xorg-lib-libXScrnSaver-devel
+Requires:	hicolor-icon-theme
+Requires:	python-modules-sqlite
 %pyrequires_eq	python-modules
 %pyrequires_eq	python
-Requires:	python-docutils >= 0.4-2
+BuildConflicts:	gnustep-gui-devel
 Requires:	python-dns
+Requires:	python-docutils >= 0.4-2
 Requires:	python-pygtk-glade >= 2.8.0
-Requires:	python-sqlite
+Suggests:	dbus(org.freedesktop.Notifications)
+Suggests:	gnome-keyring
+Suggests:	gnupg2
+Suggests:	gpgme >= 1.0.0
+Suggests:	python-Crypto
 Suggests:	python-avahi
 Suggests:	python-dbus >= 0.82.1
+Suggests:	python-farsight2
 Suggests:	python-gnome-desktop-keyring
 Suggests:	python-gnome-gconf
-Suggests:	python-pyOpenSSL
+Suggests:	python-gnome-ui
+Suggests:	python-gstreamer
+Suggests:	python-pyOpenSSL >= 0.9
+Suggests:	python-pyasn1
+Suggests:	python-sexy
 Suggests:	python-sqlite
+# sr@Latn vs. sr@latin
+Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -49,8 +63,6 @@ działa z nim ładnie.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 %{__intltoolize}
@@ -60,6 +72,7 @@ działa z nim ładnie.
 %{__autoconf}
 %{__automake}
 %configure
+
 %{__make} \
 	CC="%{__cc}" \
 	PREFIX=%{_prefix} \
@@ -73,21 +86,27 @@ rm -rf $RPM_BUILD_ROOT
 	LIBDIR=/%{_lib} \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/{setup_win32.pyo}
-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/no
 
+[ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr@latin ] || \
+       mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
 %find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+%update_icon_cache hicolor
+
+%postun
+%update_icon_cache hicolor
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README THANKS
-%attr(755,root,root) %{_bindir}/*
-%dir %{_libdir}/%{name}
-%attr(755,root,root) %{_libdir}/%{name}/*.so
+%doc AUTHORS ChangeLog README THANKS THANKS.artists
+%attr(755,root,root) %{_bindir}/gajim*
 %{_datadir}/%{name}
-%{_desktopdir}/*.desktop
-%{_mandir}/man1/*
-%{_pixmapsdir}/*.png
+%{_desktopdir}/gajim.desktop
+%{_mandir}/man1/*.1*
+%{_iconsdir}/hicolor/64x64/apps/gajim.png
+%{_iconsdir}/hicolor/scalable/apps/gajim.svg