From 5ed2c8cda633283e23f03a4ba24aebe84847afbe Mon Sep 17 00:00:00 2001
From: Dawid Gajownik <gajownik@fedoraproject.org>
Date: Apr 13 2006 12:27:56 +0000
Subject: Update to 0.10-pre1 and drop patches


---

diff --git a/.cvsignore b/.cvsignore
index 98c2f3e..a6d48cc 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gajim-0.9.1.tar.bz2
+gajim-0.10-pre1.tar.bz2
diff --git a/gajim-0.9.1.modularX.patch b/gajim-0.9.1.modularX.patch
deleted file mode 100644
index 80649ca..0000000
--- a/gajim-0.9.1.modularX.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Nurp gajim-0.9.orig/src/common/Makefile gajim-0.9/src/common/Makefile
---- gajim-0.9.orig/src/common/Makefile	2005-12-23 14:20:58.000000000 +0100
-+++ gajim-0.9/src/common/Makefile	2005-12-26 18:11:32.000000000 +0100
-@@ -1,12 +1,12 @@
- # Set the C flags to include the GTK+ and Python libraries
- PYTHONVER = `python -c 'import sys; print sys.version[:3]'`
--CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0` -fpic -I/usr/include/python$(PYTHONVER) -I.
--LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0`
-+CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0 xscrnsaver` -fpic -I/usr/include/python$(PYTHONVER) -I.
-+LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0 xscrnsaver`
- 
- all: idle.so
- 
- idle.so:
--	$(CC) $(OPTFLAGS) $(CFLAGS) $(LDFLAGS) -shared idle.c $^ -o $@ -L/usr/X11R6$(LIBDIR) -lX11 -lXss -lXext
-+	$(CC) $(OPTFLAGS) $(CFLAGS) $(LDFLAGS) -shared idle.c $^ -o $@
- 
- clean:
- 	rm -f *.so
diff --git a/gajim-0.9.1.notify_crash.patch b/gajim-0.9.1.notify_crash.patch
deleted file mode 100644
index f59cd86..0000000
--- a/gajim-0.9.1.notify_crash.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Nur gajim-0.9.1.orig/src/notify.py gajim-0.9.1/src/notify.py
---- gajim-0.9.1.orig/src/notify.py	2005-12-27 01:07:44.000000000 +0100
-+++ gajim-0.9.1/src/notify.py	2006-03-30 01:34:02.000000000 +0200
-@@ -189,10 +189,29 @@
- 		self.notif = dbus_support.get_notifications_interface()
- 		if self.notif is None:
- 			raise dbus.dbus_bindings.DBusException()
--		self.id = self.notif.Notify(dbus.String(_('Gajim')),
--			dbus.String(path), dbus.UInt32(0), ntype, dbus.Byte(0),
--			dbus.String(event_type), dbus.String(txt),
--			[dbus.String(path)], {'default':0}, [''], True, dbus.UInt32(5))
-+		timeout = gajim.config.get('notification_timeout') # in seconds
-+		# Determine the version of notifications
-+		# FIXME: This code is blocking, as is the next set. That should be fixed
-+		# now that we have a class to encapsulate this behavior
-+		try:
-+			(name, vendor, version) = self.notif.GetServerInfo()
-+		except:
-+			# No way to determine the version number, set it to the latest
-+			# since it doesn't properly support the version number
-+			version = '0.3.1'
-+		if version.startswith('0.2'):
-+			try:
-+				self.id = self.notif.Notify(dbus.String(_('Gajim')),
-+					dbus.String(path), dbus.UInt32(0), ntype, dbus.Byte(0),
-+					dbus.String(event_type), dbus.String(txt),
-+					[dbus.String(path)], {'default': 0}, [''], True, dbus.UInt32(
-+					timeout))
-+			except AttributeError:
-+				version = '0.3.1' # we're actually dealing with the newer version
-+		if version.startswith('0.3'):
-+			self.id = self.notif.Notify(dbus.String(_('Gajim')),
-+				dbus.String(path), dbus.UInt32(0), dbus.String(event_type),
-+				dbus.String(txt), dbus.String(""), {}, dbus.UInt32(timeout*1000))
- 		notification_response_manager.attach_to_interface()
- 		notification_response_manager.pending[self.id] = self
- 
diff --git a/gajim.spec b/gajim.spec
index c9a625b..f86c544 100644
--- a/gajim.spec
+++ b/gajim.spec
@@ -1,14 +1,12 @@
 Name:           gajim
-Version:        0.9.1
-Release:        3%{?dist}
+Version:        0.10
+Release:        0.1.pre1%{?dist}
 Summary:        Jabber client written in PyGTK
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://gajim.org/
-Source0:        http://gajim.org/downloads/gajim-%{version}.tar.bz2
-Patch0:         gajim-0.9.1.modularX.patch
-Patch1:         gajim-0.9.1.notify_crash.patch
+Source0:        http://gajim.org/downloads/gajim-%{version}-pre1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -35,11 +33,7 @@ Gajim does not require GNOME to run, eventhough it exists with it nicely.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
-# gajim wants to handle executables; why?
-sed -i -e '/MimeType/d' gajim.desktop.in
 
 %build
 make \
@@ -85,6 +79,10 @@ rm -rf %{buildroot}
 %{_mandir}/man1/gajim-remote.1*
 
 %changelog
+* Thu Apr 13 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 0.10-0.1.pre1
+- Update to 0.10-pre1
+- Drop patches
+
 * Thu Mar 30 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 0.9.1-3
 - Remove Gnome dependencies
 - Fix crash with notify-daemon (#187274, Stefan Plewako)
diff --git a/sources b/sources
index 03f7fcd..204b84c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ca82dfb7ab5c51984357ea7bab0e99af  gajim-0.9.1.tar.bz2
+e59de6722900155e3f5644c62241c9a9  gajim-0.10-pre1.tar.bz2