[gajim/f13/master] update to 0.14
Michal Schmidt
michich at fedoraproject.org
Mon Sep 6 19:51:46 UTC 2010
commit 053fd1193f16256c5a3f87296fe13fd344f49dff
Author: Michal Schmidt <mschmidt at redhat.com>
Date: Mon Sep 6 21:46:04 2010 +0200
update to 0.14
picked the changes from f14
.gitignore | 2 +
gajim-0.13.3-gnome-keyring-CancelledError.patch | 23 --------
gajim-0.13.90-gnome-keyring-CancelledError.patch | 26 +++++++++
...ns.patch => gajim-0.14-disable-libasyncns.patch | 16 +++---
gajim.spec | 59 ++++++++++++++------
sources | 2 +-
6 files changed, 78 insertions(+), 50 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d97d786..60589cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
gajim-0.13.4.tar.bz2
+/gajim-0.13.90.tar.bz2
+/gajim-0.14.tar.bz2
diff --git a/gajim-0.13.90-gnome-keyring-CancelledError.patch b/gajim-0.13.90-gnome-keyring-CancelledError.patch
new file mode 100644
index 0000000..b93dfd8
--- /dev/null
+++ b/gajim-0.13.90-gnome-keyring-CancelledError.patch
@@ -0,0 +1,26 @@
+Newer gnome-keyring may raise CancelledError
+
+In such case let's continue without the keyring instead of crashing.
+
+
+ Patch attached to upstream trac ticket:
+ http://trac.gajim.org/ticket/5633
+ https://bugzilla.redhat.com/show_bug.cgi?id=556374
+ -- Michal
+
+Update 2010-08-19:
+I'm seeing IOError, perhaps because of a gnome-keyring bug. Added.
+
+Index: gajim-0.13.90/src/common/passwords.py
+===================================================================
+--- gajim-0.13.90.orig/src/common/passwords.py
++++ gajim-0.13.90/src/common/passwords.py
+@@ -197,7 +197,7 @@ def get_storage():
+ if USER_USES_GNOMEKEYRING:
+ try:
+ storage = GnomePasswordStorage()
+- except (gnomekeyring.NoKeyringDaemonError, gnomekeyring.DeniedError):
++ except (gnomekeyring.NoKeyringDaemonError, gnomekeyring.DeniedError, gnomekeyring.CancelledError, gnomekeyring.IOError):
+ storage = None
+ if storage is None:
+ if gajim.config.get('use_kwalletcli'):
diff --git a/gajim-0.13.3-disable-libasyncns.patch b/gajim-0.14-disable-libasyncns.patch
similarity index 64%
rename from gajim-0.13.3-disable-libasyncns.patch
rename to gajim-0.14-disable-libasyncns.patch
index 55c8e08..03a34b2 100644
--- a/gajim-0.13.3-disable-libasyncns.patch
+++ b/gajim-0.14-disable-libasyncns.patch
@@ -9,16 +9,16 @@ Thankfully libasyncns is not essential for Gajim to work.
-- Michal
-Index: gajim-0.13.3/src/common/resolver.py
+Index: gajim-0.14/src/common/resolver.py
===================================================================
---- gajim-0.13.3.orig/src/common/resolver.py
-+++ gajim-0.13.3/src/common/resolver.py
+--- gajim-0.14.orig/src/common/resolver.py
++++ gajim-0.14/src/common/resolver.py
@@ -39,7 +39,7 @@ ns_type_pattern = re.compile('^[a-z]+$')
host_pattern = re.compile('^[a-z0-9\-._]*[a-z0-9]\.[a-z]{2,}$')
try:
-- #raise ImportError("Manually disabled libasync")
-+ raise ImportError("Manually disabled libasync")
- import libasyncns
- USE_LIBASYNCNS = True
- log.info("libasyncns-python loaded")
+- #raise ImportError("Manually disabled libasync")
++ raise ImportError("Manually disabled libasync")
+ import libasyncns
+ USE_LIBASYNCNS = True
+ log.info("libasyncns-python loaded")
diff --git a/gajim.spec b/gajim.spec
index 20bdbdf..6420e45 100644
--- a/gajim.spec
+++ b/gajim.spec
@@ -1,43 +1,52 @@
Summary: Jabber client written in PyGTK
Name: gajim
-%global majorver 0.13
-Version: 0.13.4
+%global majorver 0.14
+Version: 0.14
Release: 1%{?dist}
License: GPLv3
Group: Applications/Internet
URL: http://gajim.org/
Source0: http://gajim.org/downloads/%{majorver}/%{name}-%{version}.tar.bz2
-Patch0: gajim-0.13.3-gnome-keyring-CancelledError.patch
+Patch0: gajim-0.13.90-gnome-keyring-CancelledError.patch
# libasyncns triggers a kernel bug (RHBZ#529202), so let's not use it until
# it's fixed.
-Patch1: gajim-0.13.3-disable-libasyncns.patch
+Patch1: gajim-0.14-disable-libasyncns.patch
BuildArch: noarch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Requires: avahi-tools
+Requires: avahi-ui-tools
+# for NSLookupResolver; a fallback when libasyncns does not work
Requires: bind-utils
Requires: dbus-python
-
-Requires: gnome-python2-gnome
+# XXX: Gajim does not import bonobo directly, but some module does and
+# prints an error if it's not available.
Requires: gnome-python2-bonobo
-Requires: gnome-python2-canvas
Requires: gnome-python2-desktop
-Requires: gnome-python2-libegg
+Requires: gnome-python2-gnome
Requires: gnupg
+Requires: hicolor-icon-theme
Requires: notify-python
-Requires: pygtk2-libglade
Requires: pyOpenSSL
Requires: python-crypto
-Requires: python-docutils
Requires: python-GnuPGInterface
Requires: python-kerberos
-Requires: python-sexy
# See above comment for Patch1
#Requires: python-libasyncns
-# these are dlopen'd using ctypes find_library/LoadLibrary
+
+# these are dlopen'd using ctypes find_library/LoadLibrary:
Requires: gtkspell
Requires: libXScrnSaver
+# Optional features with significatly sized deps. Gajim detects them at
+# runtime. Intentionally not as hard deps.
+# XXX: Gajim could install them using PackageKit when really necessary.
+# Audio/Video calls:
+#Requires: farsight2-python
+# Password encryption:
+#Requires: gnome-python2-gnomekeyring
+# RST Generator:
+#Requires: python-docutils
+
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: gtk2-devel
@@ -56,8 +65,7 @@ Gajim does not require GNOME to run, even though it exists with it nicely.
%patch1 -p1
%build
-%configure --docdir=%{_docdir}/%{name}-%{version} \
- --disable-static --disable-trayicon
+%configure --docdir=%{_docdir}/%{name}-%{version}
make %{?_smp_mflags}
@@ -74,6 +82,17 @@ desktop-file-install --vendor fedora --delete-original \
%find_lang %{name}
+%post
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+ touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%clean
rm -rf %{buildroot}
@@ -86,20 +105,24 @@ rm -rf %{buildroot}
%doc THANKS
%doc THANKS.artists
%doc %{_mandir}/man1/%{name}.1*
+%doc %{_mandir}/man1/%{name}-history-manager.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
+%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
+%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/data
+%{_datadir}/%{name}/icons
%{_datadir}/%{name}/src
%changelog
+* Mon Sep 06 2010 Michal Schmidt <mschmidt at redhat.com> 0.14-1
+- Update to 0.14 release.
+
* Sat Apr 03 2010 Michal Schmidt <mschmidt at redhat.com> 0.13.4-1
- Update to upstream bugfix release 0.13.4.
diff --git a/sources b/sources
index b2cedca..f1352ff 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-097e96c2f73a13be4edadea11b495ce6 gajim-0.13.4.tar.bz2
+f1508ff76344851eaf3fd4c0e32f22f6 gajim-0.14.tar.bz2
More information about the scm-commits
mailing list