rpms/gajim/FC-4 gajim-0.9.1.nodbus.patch, NONE, 1.1 gajim.spec, 1.7, 1.8

[Dawid Gajownik (gajownik)]

Author: gajownik

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

Modified Files:
	gajim.spec 
Added Files:
	gajim-0.9.1.nodbus.patch 
Log Message:
Disable D-BUS support


gajim-0.9.1.nodbus.patch:

--- NEW FILE gajim-0.9.1.nodbus.patch ---
diff -Nurp gajim-0.9.1.orig/scripts/gajim gajim-0.9.1/scripts/gajim
--- gajim-0.9.1.orig/scripts/gajim	2005-12-27 01:07:53.000000000 +0100
+++ gajim-0.9.1/scripts/gajim	2006-02-17 14:53:47.000000000 +0100
@@ -28,5 +28,6 @@ if [ `id -u` -eq 0 ]; then
 fi
 
 cd PREFIX/share/gajim/src
+unset DBUS_SESSION_BUS_ADDRESS
 export PYTHONPATH="$PYTHONPATH:PREFIXLIB/gajim"
 exec python -OOt gajim.py $@


Index: gajim.spec
===================================================================
RCS file: /cvs/extras/rpms/gajim/FC-4/gajim.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gajim.spec	4 Feb 2006 23:15:45 -0000	1.7
+++ gajim.spec	17 Feb 2006 14:16:42 -0000	1.8
@@ -10,6 +10,8 @@
 License:        GPL
 URL:            http://gajim.org/
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -27,7 +29,7 @@
 Requires:       gnome-python2-libegg
 %endif
 
-Requires:       dbus-python
+#Requires:       dbus-python
 Requires:       gnome-python2-gconf
 Requires:       pygtk2-libglade
 Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
@@ -41,6 +43,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 sed -i -e 's/install\: all/install\:/' Makefile
 # gajim wants to handle executables; why?
@@ -86,18 +89,19 @@
 %defattr(-,root,root,-)
 %doc AUTHORS Changelog
 %{_bindir}/gajim
-%{_bindir}/gajim-remote
+%exclude %{_bindir}/gajim-remote
 %{_libdir}/gajim/
 %{_datadir}/applications/*gajim.desktop
 %{_datadir}/gajim/
 %{_datadir}/pixmaps/gajim*
 %{_mandir}/man1/gajim.1*
-%{_mandir}/man1/gajim-remote.1*
+%exclude %{_mandir}/man1/gajim-remote.1*
 
 %changelog
-* Sat Feb  4 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 0.9.1-1
+* 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
+- disable D-BUS support
 
 * Tue Sep  6 2005 Dawid Gajownik <gajownik[AT]fedora.pl> - 0.8.2-1
 - new version 0.8.2