rpms/gajim/FC-4 gajim-0.9.1.disco_block.patch, NONE, 1.1 gajim.spec, 1.8, 1.9

[Dawid Gajownik (gajownik)]

Author: gajownik

Update of /cvs/extras/rpms/gajim/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25775

Modified Files:
	gajim.spec 
Added Files:
	gajim-0.9.1.disco_block.patch 
Log Message:
- Fix "Discover Services" (patch from Dimitur Kirov)
  http://trac.gajim.org/ticket/1609
- Remove Gnome dependencies


gajim-0.9.1.disco_block.patch:

--- NEW FILE gajim-0.9.1.disco_block.patch ---
diff -ur gajim_0.9.1.orig/src/disco.py gajim_0.9.1/src/disco.py
--- gajim_0.9.1.orig/src/disco.py	2006-02-24 01:12:06.000000000 +0200
+++ gajim_0.9.1/src/disco.py	2006-02-24 01:10:12.000000000 +0200
@@ -828,7 +828,6 @@
 		model = self.window.services_treeview.get_model()
 		model.clear()
 		self._total_items = self._progress = 0
-		self.window.progressbar.pulse()
 		self.window.progressbar.show()
 		self._pulse_timeout = gobject.timeout_add(250, self._pulse_timeout_cb)
 		self.cache.get_items(self.jid, self.node, self._agent_items,


Index: gajim.spec
===================================================================
RCS file: /cvs/extras/rpms/gajim/FC-4/gajim.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gajim.spec	17 Feb 2006 14:16:42 -0000	1.8
+++ gajim.spec	25 Feb 2006 10:00:36 -0000	1.9
@@ -1,9 +1,6 @@
-# Set to '1' if you want to use internal trayicon and gtkspell modules.
-%define         use_internal_modules   0
-
 Name:           gajim
 Version:        0.9.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Jabber client written in PyGTK
 
 Group:          Applications/Internet
@@ -12,6 +9,8 @@
 Source0:        http://gajim.org/downloads/gajim-%{version}.tar.bz2
 # D-BUS in FC4 is too old → http://trac.gajim.org/ticket/1566
 Patch0:         gajim-0.9.1.nodbus.patch
+# http://trac.gajim.org/ticket/1609
+Patch1:         gajim-0.9.1.disco_block.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -21,16 +20,10 @@
 BuildRequires:  pkgconfig
 BuildRequires:  pygtk2-devel
 BuildRequires:  python-devel
-
-%if %{use_internal_modules}
 BuildRequires:  gtkspell-devel
-%else
-Requires:       gnome-python2-gtkspell
-Requires:       gnome-python2-libegg
-%endif
 
 #Requires:       dbus-python
-Requires:       gnome-python2-gconf
+#Requires:       gnome-python2-gconf
 Requires:       pygtk2-libglade
 Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires:       python-sqlite2
@@ -44,18 +37,13 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
-sed -i -e 's/install\: all/install\:/' Makefile
 # gajim wants to handle executables; why?
 sed -i -e '/MimeType/d' gajim.desktop.in
 
 %build
 make \
-%if ! %{use_internal_modules}
-	translation \
-	idle \
-	gajim.desktop \
-%endif
 	CC="%{__cc}" \
 	LIBDIR="/%{_lib}" \
 	OPTFLAGS="%{optflags}" \
@@ -98,6 +86,11 @@
 %exclude %{_mandir}/man1/gajim-remote.1*
 
 %changelog
+* Sat Feb 25 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 0.9.1-2
+- Fix "Discover Services" (patch from Dimitur Kirov)
+  http://trac.gajim.org/ticket/1609
+- Remove Gnome dependencies
+
 * Fri Feb 17 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 0.9.1-1
 - update to 0.9.1 (Eric Tanguy, #176614)
 - drop aplay.patch