From 8d2ef47368d0cae7b4582f897b2c80a4d0a6b3f2 Mon Sep 17 00:00:00 2001
From: Dawid Gajownik <gajownik@fedoraproject.org>
Date: Jan 15 2006 16:11:53 +0000
Subject: - update to 0.9.1 (Eric Tanguy, #176614)

- drop aplay.patch
- fix compilation with modular X.Org X11R7

---

diff --git a/.cvsignore b/.cvsignore
index ca88968..98c2f3e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gajim-0.8.2.tar.bz2
+gajim-0.9.1.tar.bz2
diff --git a/gajim-0.8.aplay.patch b/gajim-0.8.aplay.patch
deleted file mode 100644
index 7993e6c..0000000
--- a/gajim-0.8.aplay.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nrup gajim-0.8.orig/src/config.py gajim-0.8/src/config.py
---- gajim-0.8.orig/src/config.py	2005-08-19 09:47:31.000000000 +0200
-+++ gajim-0.8/src/config.py	2005-08-20 17:45:32.000000000 +0200
-@@ -296,7 +296,7 @@ class PreferencesWindow:
- 		# sound player
- 		player = gajim.config.get('soundplayer')
- 		if player == '': # only on first time Gajim starts
--			commands = ('esdplay', 'artsplay', 'aplay', 'play')
-+			commands = ('aplay', 'esdplay', 'artsplay', 'play')
- 			for command in commands:
- 				if helpers.is_in_path(command):
- 					self.xml.get_widget('soundplayer_entry').set_text(command)
diff --git a/gajim-0.9.1.modularX.patch b/gajim-0.9.1.modularX.patch
new file mode 100644
index 0000000..80649ca
--- /dev/null
+++ b/gajim-0.9.1.modularX.patch
@@ -0,0 +1,19 @@
+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.spec b/gajim.spec
index fb8dc38..19a8f8d 100644
--- a/gajim.spec
+++ b/gajim.spec
@@ -2,7 +2,7 @@
 %define         use_internal_modules   0
 
 Name:           gajim
-Version:        0.8.2
+Version:        0.9.1
 Release:        1%{?dist}
 Summary:        Jabber client written in PyGTK
 
@@ -10,12 +10,14 @@ Group:          Applications/Internet
 License:        GPL
 URL:            http://gajim.org/
 Source0:        http://gajim.org/downloads/gajim-%{version}.tar.bz2
-Patch0:         gajim-0.8.aplay.patch
+Patch0:         gajim-0.9.1.modularX.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  gtk2-devel
+BuildRequires:  intltool
+BuildRequires:  libXScrnSaver-devel
 BuildRequires:  pkgconfig
 BuildRequires:  pygtk2-devel
 BuildRequires:  python-devel
@@ -28,8 +30,10 @@ Requires:       gnome-python2-libegg
 %endif
 
 Requires:       dbus-python
-Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
+Requires:       gnome-python2-gconf
 Requires:       pygtk2-libglade
+Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
+Requires:       python-sqlite2
 
 %description
 Gajim is a Jabber client written in PyGTK. The goal of Gajim's developers is
@@ -41,12 +45,16 @@ Gajim does not require GNOME to run, eventhough it exists with it nicely.
 %setup -q
 %patch0 -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}" \
@@ -80,14 +88,21 @@ rm -rf %{buildroot}
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS Changelog
-%{_bindir}/*
+%{_bindir}/gajim
+%{_bindir}/gajim-remote
 %{_libdir}/gajim/
 %{_datadir}/applications/*gajim.desktop
 %{_datadir}/gajim/
 %{_datadir}/pixmaps/gajim*
-%{_mandir}/man1/gajim*
+%{_mandir}/man1/gajim.1*
+%{_mandir}/man1/gajim-remote.1*
 
 %changelog
+* Sun Jan 15 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 0.9.1-1
+- update to 0.9.1 (Eric Tanguy, #176614)
+- drop aplay.patch
+- fix compilation with modular X.Org X11R7
+
 * Tue Sep  6 2005 Dawid Gajownik <gajownik[AT]fedora.pl> - 0.8.2-1
 - new version 0.8.2
 - remove patches .cflags, .po, .x86_64, .remote (pushed upstream)
diff --git a/sources b/sources
index e9f1590..03f7fcd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-14b00f8ed7d84d90793782db7df40ec1  gajim-0.8.2.tar.bz2
+ca82dfb7ab5c51984357ea7bab0e99af  gajim-0.9.1.tar.bz2