From aaea827b583f96f1a9352c4ff91ce40b25761e47 Mon Sep 17 00:00:00 2001
From: Michal Schmidt <mschmidt@redhat.com>
Date: Aug 19 2010 08:38:24 +0000
Subject: - Update to 0.13.90 (a.k.a. 0.14 beta1)

- Icon cache handling.
- Needs avahi-ui-tools for zeroconf support and
  farsight2-python for audio/video.
- Refresh pygtk crash patch.
- Skip gnome-keyring patch for now.

---

diff --git a/.gitignore b/.gitignore
index d97d786..0657312 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 gajim-0.13.4.tar.bz2
+/gajim-0.13.90.tar.bz2
diff --git a/gajim-0.13.4-pygtk-crash-python2.7-workaround.patch b/gajim-0.13.4-pygtk-crash-python2.7-workaround.patch
deleted file mode 100644
index fe4f80d..0000000
--- a/gajim-0.13.4-pygtk-crash-python2.7-workaround.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Avoid an assertion failure and crash of the python interpreter caused by
-pygtk's usage of the deprecated PyCObject and Python 2.7.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=621887
-
-Index: gajim-0.13.4/src/gajim.py
-===================================================================
---- gajim-0.13.4.orig/src/gajim.py
-+++ gajim-0.13.4/src/gajim.py
-@@ -131,7 +131,7 @@ if os.name == 'nt':
- 	sys.stderr = MyStderr()
- 
- # PyGTK2.10+ only throws a warning
--warnings.filterwarnings('error', module='gtk')
-+warnings.filterwarnings('error', module='gtk', append=True)
- try:
- 	import gtk
- except Warning, msg:
diff --git a/gajim-0.13.90-pygtk-crash-python2.7-workaround.patch b/gajim-0.13.90-pygtk-crash-python2.7-workaround.patch
new file mode 100644
index 0000000..a0ccf7e
--- /dev/null
+++ b/gajim-0.13.90-pygtk-crash-python2.7-workaround.patch
@@ -0,0 +1,18 @@
+Avoid an assertion failure and crash of the python interpreter caused by
+pygtk's usage of the deprecated PyCObject and Python 2.7.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=621887
+
+Index: gajim-0.13.90/src/gajim.py
+===================================================================
+--- gajim-0.13.90.orig/src/gajim.py
++++ gajim-0.13.90/src/gajim.py
+@@ -133,7 +133,7 @@ if os.name == 'nt':
+     sys.stderr = MyStderr()
+ 
+ # PyGTK2.10+ only throws a warning
+-warnings.filterwarnings('error', module='gtk')
++warnings.filterwarnings('error', module='gtk', append=True)
+ try:
+     import gobject
+     import gtk
diff --git a/gajim.spec b/gajim.spec
index 59c3b8a..d5443db 100644
--- a/gajim.spec
+++ b/gajim.spec
@@ -1,20 +1,21 @@
 Summary:	Jabber client written in PyGTK
 Name:		gajim
-%global		majorver 0.13
-Version:	0.13.4
-Release:	2%{?dist}
+%global		majorver 0.14
+Version:	0.13.90
+Release:	1%{?dist}
 License:	GPLv3
 Group:		Applications/Internet
 URL:		http://gajim.org/
 Source0:	http://gajim.org/downloads/%{majorver}/%{name}-%{version}.tar.bz2
-Patch0:		gajim-0.13.3-gnome-keyring-CancelledError.patch
-Patch1:		gajim-0.13.4-pygtk-crash-python2.7-workaround.patch
+#Patch0:		gajim-0.13.3-gnome-keyring-CancelledError.patch
+Patch1:		gajim-0.13.90-pygtk-crash-python2.7-workaround.patch
 BuildArch:	noarch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-Requires:	avahi-tools
+Requires:	avahi-ui-tools
 Requires:	bind-utils
 Requires:	dbus-python
+Requires:	farsight2-python
 
 Requires:	gnome-python2-gnome
 Requires:	gnome-python2-bonobo
@@ -34,6 +35,7 @@ Requires:	python-libasyncns
 # these are dlopen'd using ctypes find_library/LoadLibrary
 Requires:	gtkspell
 Requires:	libXScrnSaver
+Requires:	hicolor-icon-theme
 
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
@@ -49,7 +51,7 @@ Gajim does not require GNOME to run, even though it exists with it nicely.
 
 %prep
 %setup -q
-%patch0 -p1
+#% patch0 -p1
 %patch1 -p1
 
 %build
@@ -74,6 +76,18 @@ desktop-file-install --vendor fedora --delete-original \
 %clean
 rm -rf %{buildroot}
 
+%post
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS
@@ -83,20 +97,29 @@ rm -rf %{buildroot}
 %doc THANKS
 %doc THANKS.artists
 %doc %{_mandir}/man1/%{name}.1*
+%doc %{_mandir}/man1/%{name}-history-manager.1*
 %doc %{_mandir}/man1/%{name}-remote.1*
 %{_bindir}/%{name}
 %{_bindir}/%{name}-history-manager
 %{_bindir}/%{name}-remote
 %{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/pixmaps/%{name}.png
-%{_datadir}/pixmaps/%{name}.svg
-%{_datadir}/pixmaps/%{name}_about.png
+%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
+%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/data
+%{_datadir}/%{name}/icons
 %{_datadir}/%{name}/src
 
 %changelog
+* Thu Aug 19 2010 Michal Schmidt <mschmidt@redhat.com> 0.13.90-1
+- Update to 0.13.90 (a.k.a. 0.14 beta1)
+- Icon cache handling.
+- Needs avahi-ui-tools for zeroconf support and
+  farsight2-python for audio/video.
+- Refresh pygtk crash patch.
+- Skip gnome-keyring patch for now.
+
 * Tue Aug 10 2010 Michal Schmidt <mschmidt@redhat.com> 0.13.4-2
 - Workaround pygtk crash with Python 2.7 (RHBZ#621887).
 
diff --git a/sources b/sources
index b2cedca..56c56b9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-097e96c2f73a13be4edadea11b495ce6  gajim-0.13.4.tar.bz2
+2eb24391049a7cf09417e8b8c020cc1f  gajim-0.13.90.tar.bz2