rpms/gajim/EL-5 gajim-gdk-color-to_string.diff, NONE, 1.1 gajim.spec, 1.18, 1.19 sources, 1.11, 1.12

Mon Sep 28 22:35:06 UTC 2009

Author: michich

Update of /cvs/pkgs/rpms/gajim/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31039

Modified Files:
	gajim.spec sources 
Added Files:
	gajim-gdk-color-to_string.diff 
Log Message:
* Mon Sep 28 2009 Michal Schmidt <mschmidt at redhat.com> - 0.12.5-1
- Update to 0.12.5, backport from Debarshi Ray's devel/ branch.
- Avoid bug caused by dependency on newer Gtk (gajim-gdk-color-to_string.diff)
- Use el5 instead of rhel macro for conditional checks.


gajim-gdk-color-to_string.diff:
 config.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gajim-gdk-color-to_string.diff ---
Avoid this bug when entering Preferences:
AttributeError: 'gtk.gdk.Color' object has no attribute 'to_string'
This attribute was introduced in newer Gtk than what we have in RHEL5.
Index: gajim-0.12.5/src/config.py
===================================================================
--- gajim-0.12.5.orig/src/config.py
+++ gajim-0.12.5/src/config.py
@@ -394,7 +394,7 @@ class PreferencesWindow:
 
 		# Default Status messages
 		self.default_msg_tree = self.xml.get_widget('default_msg_treeview')
-		col2 = self.default_msg_tree.rc_get_style().bg[gtk.STATE_ACTIVE].to_string()
+#		col2 = self.default_msg_tree.rc_get_style().bg[gtk.STATE_ACTIVE].to_string()
 		# (status, translated_status, message, enabled)
 		model = gtk.ListStore(str, str, str, bool)
 		self.default_msg_tree.set_model(model)
@@ -412,7 +412,7 @@ class PreferencesWindow:
 		col.set_attributes(renderer, text = 2)
 		renderer.connect('edited', self.on_default_msg_cell_edited)
 		renderer.set_property('editable', True)
-		renderer.set_property('cell-background', col2)
+#		renderer.set_property('cell-background', col2)
 		col = gtk.TreeViewColumn(_('Enabled'))
 		col.set_resizable(True)
 		self.default_msg_tree.append_column(col)


Index: gajim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gajim/EL-5/gajim.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- gajim.spec	11 Mar 2009 17:02:12 -0000	1.18
+++ gajim.spec	28 Sep 2009 22:35:06 -0000	1.19
@@ -2,13 +2,14 @@
 
 Summary:	Jabber client written in PyGTK
 Name:		gajim
-Version:	0.12.1
-Release:	1%{?dist}.2
-License:	GPLv2
+Version:	0.12.5
+Release:	1%{?dist}
+License:	GPLv3
 Group:		Applications/Internet
 URL:		http://gajim.org/
-Source0:	http://gajim.org/downloads/%{name}-%{version}.tar.gz
+Source0:	http://gajim.org/downloads/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-keyring.diff
+Patch1:		%{name}-gdk-color-to_string.diff
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -16,21 +17,25 @@ Requires:	avahi-tools
 Requires:	bind-utils
 Requires:	dbus-python
 
-%if 0%{?fc8}%{?fc9}%{?rhel}
+%if 0%{?fc8}%{?fc9}%{?el5}
 %else
 Requires:	gnome-python2-gnome
 %endif
 
+Requires:	gnome-python2-bonobo
 Requires:	gnome-python2-canvas
+Requires:	gnupg
 Requires:	notify-python
 Requires:	pygtk2-libglade
 Requires:	pyOpenSSL
+Requires:	python-crypto
 Requires:	python-docutils
+Requires:	python-GnuPGInterface
 Requires:	python-kerberos
 %if 0%{?fedora}
 Requires:	python-sexy
 %endif
-%if 0%{?rhel}
+%if 0%{?el5}
 Requires:	python-sqlite2
 %endif
 
@@ -51,10 +56,7 @@ Gajim does not require GNOME to run, eve
 %prep
 %setup -q
 %patch0 -p0
-
-# Suppress error.
-sed --in-place --expression '1d' ./src/gajim.py
-sed --in-place --expression '1d' ./src/gajim-remote.py
+%patch1 -p1
 
 %build
 %configure --docdir=%{_docdir}/%{name}-%{version} \
@@ -71,9 +73,6 @@ make install INSTALL="%{__install} -p" D
 
 rm -rf $RPM_BUILD_ROOT%{python_sitearch}/%{name}/*.la
 
-# Suppress rpmlint error.
-chmod 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/src/history_manager.py
-
 desktop-file-install --vendor fedora --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --remove-category=Application \
@@ -91,12 +90,15 @@ rm -rf %{buildroot}
 %doc COPYING
 %doc README.html
 %doc THANKS
+%doc THANKS.artists
 %doc %{_mandir}/man1/%{name}.1*
 %doc %{_mandir}/man1/%{name}-remote.1*
 %{_bindir}/%{name}
+%{_bindir}/%{name}-history-manager
 %{_bindir}/%{name}-remote
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
+%{_datadir}/pixmaps/%{name}.svg
 %{_datadir}/pixmaps/%{name}_about.png
 
 %dir %{_datadir}/%{name}
@@ -109,6 +111,11 @@ rm -rf %{buildroot}
 %{python_sitearch}/%{name}/trayicon.so
 
 %changelog
+* Mon Sep 28 2009 Michal Schmidt <mschmidt at redhat.com> - 0.12.5-1
+- Update to 0.12.5, backport from Debarshi Ray's devel/ branch.
+- Avoid bug caused by dependency on newer Gtk (gajim-gdk-color-to_string.diff)
+- Use el5 instead of rhel macro for conditional checks.
+
 * Wed Mar 11 2009 Michal Schmidt <mschmidt at redhat.com> - 0.12.1-1.el5.2
 - Took the current version of Gajim and modified the spec for EL-5.
 - Added workaround for a gnomekeyring binding bug.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gajim/EL-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	11 Mar 2009 16:21:51 -0000	1.11
+++ sources	28 Sep 2009 22:35:06 -0000	1.12
@@ -1 +1 @@
-195a7973d3fbfb538e2ee74156aa6e9e  gajim-0.12.1.tar.gz
+aef65fc0b0f993f322ee970f6deb7508  gajim-0.12.5.tar.bz2


