rpms/gajim/devel gajim-0.9.1.modularX.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 gajim.spec, 1.6, 1.7 sources, 1.4, 1.5 gajim-0.8.aplay.patch, 1.1, NONE

[Dawid Gajownik (gajownik)]

Author: gajownik

Update of /cvs/extras/rpms/gajim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13758

Modified Files:
	.cvsignore gajim.spec sources 
Added Files:
	gajim-0.9.1.modularX.patch 
Removed Files:
	gajim-0.8.aplay.patch 
Log Message:
- update to 0.9.1 (Eric Tanguy, #176614)
- drop aplay.patch
- fix compilation with modular X.Org X11R7


gajim-0.9.1.modularX.patch:

--- NEW FILE gajim-0.9.1.modularX.patch ---
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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gajim/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Sep 2005 20:38:00 -0000	1.4
+++ .cvsignore	15 Jan 2006 16:11:52 -0000	1.5
@@ -1 +1 @@
-gajim-0.8.2.tar.bz2
+gajim-0.9.1.tar.bz2


Index: gajim.spec
===================================================================
RCS file: /cvs/extras/rpms/gajim/devel/gajim.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gajim.spec	6 Sep 2005 20:38:00 -0000	1.6
+++ gajim.spec	15 Jan 2006 16:11:52 -0000	1.7
@@ -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 @@
 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 @@
 %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 @@
 %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 @@
 %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)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gajim/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Sep 2005 20:38:00 -0000	1.4
+++ sources	15 Jan 2006 16:11:53 -0000	1.5
@@ -1 +1 @@
-14b00f8ed7d84d90793782db7df40ec1  gajim-0.8.2.tar.bz2
+ca82dfb7ab5c51984357ea7bab0e99af  gajim-0.9.1.tar.bz2


--- gajim-0.8.aplay.patch DELETED ---