rpms/jabbim/devel jabbim-0.4-fix-rosterStyle-preferences.diff, NONE, 1.1 .cvsignore, 1.14, 1.15 jabbim.spec, 1.30, 1.31 sources, 1.23, 1.24

[Michal Schmidt]

Author: michich

Update of /cvs/pkgs/rpms/jabbim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29204

Modified Files:
	.cvsignore jabbim.spec sources 
Added Files:
	jabbim-0.4-fix-rosterStyle-preferences.diff 
Log Message:
* Mon Apr 13 2009 Michal Schmidt <mschmidt at redhat.com> - 0.5-0.5.svn20090408
- Update to SVN rev. 4103:
  - bugfixes for filetransfer, uniemoticons, logging
  - faster loading of avatars after login
- Install only the addons likely to be included in 0.5 final release.
- Hardcode the SVN revision into self.version.
- Prefer %global over %define.


jabbim-0.4-fix-rosterStyle-preferences.diff:

--- NEW FILE jabbim-0.4-fix-rosterStyle-preferences.diff ---
Patch status note: Upstream is rewriting the appearance preferences dialog
completely, this patch will be obsolete.  -- Michal

commit 2f1294279682ad1d37231b57a764c8e93c18e957
Author: Michal Schmidt <mschmidt at redhat.com>
Date:   Mon Apr 13 12:09:41 2009 +0200

    fix program appearance prefs dialog when no theme is set
    
    rosterStyle can be None in the config in which case rosterStyleChanged
    would traceback.

diff --git a/widgets/preferences.py b/widgets/preferences.py
index 5f44c53..13fd8f6 100644
--- a/widgets/preferences.py
+++ b/widgets/preferences.py
@@ -648,7 +648,8 @@ class preferencesWindow(QtGui.QDialog):
 		for variant in variants:
 			if variant.endswith(".cfg"):
 				default=unicode(variant)
-				if variant==self.main.config["rosterStyle"].split("/")[1]:
+				configured = self.main.config["rosterStyle"].split("/")
+				if len(configured) > 1 and variant == configured[1]:
 					self.ui.rosterVariant.insertItem(0,variant[:-4],QtCore.QVariant(variant))
 					v=unicode(variant)
 				else:


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	14 Mar 2009 15:02:17 -0000	1.14
+++ .cvsignore	13 Apr 2009 14:01:03 -0000	1.15
@@ -1 +1 @@
-jabbim-svn20090314.tar.bz2
+jabbim-svn20090408.tar.bz2


Index: jabbim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/devel/jabbim.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- jabbim.spec	14 Mar 2009 15:02:17 -0000	1.30
+++ jabbim.spec	13 Apr 2009 14:01:03 -0000	1.31
@@ -1,16 +1,19 @@
+%global	svnrev	4103
+%global	svndate	20090408
 Name:		jabbim
 Version:	0.5
-Release:	0.4.svn20090314%{?dist}
+Release:	0.5.svn%{svndate}%{?dist}
 Summary:	Jabber client for mere mortals
 
 Group:		Applications/Internet
 License:	GPLv2+
 URL:		http://dev.jabbim.cz/jabbim
 # The source was obtained from upstream SVN repository:
-# svn export -r 4062 svn://dev.jabbim.cz/jabbim/trunk jabbim-svn20090314
-# tar -cjf jabbim-svn20090314.tar.bz2 jabbim-svn20090314/
-Source0:	jabbim-svn20090314.tar.bz2
+# svn export -r %{svnrev} svn://dev.jabbim.cz/jabbim/trunk jabbim-svn%{svndate}
+# tar -cjf jabbim-svn%{svndate}.tar.bz2 jabbim-svn%{svndate}/
+Source0:	jabbim-svn%{svndate}.tar.bz2
 Patch0:		jabbim-0.4-autoupdate-disable-notification.diff
+Patch1:		jabbim-0.4-fix-rosterStyle-preferences.diff
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -27,7 +30,7 @@
 Requires:	python-configobj
 Requires:	pyOpenSSL
 
-%define jabbimdata %{_datadir}/jabbim
+%global jabbimdata %{_datadir}/jabbim
 
 %description
 Jabbim is a user-friendly Jabber (XMPP) client. Its goal is to make the modern
@@ -37,13 +40,25 @@
 
 
 %prep
-%setup -q -n jabbim-svn20090314
+%setup -q -n jabbim-svn%{svndate}
 %patch0 -p1
+%patch1 -p1
+# replace runtime detection of the SVN revision with hardcoded info
+sed -i -e "s#\\(self.version = '0.5 SVN' + \\)\\(utils.getSvnVersion()\\)#\\1' - rev. %{svnrev}'#" jabbim.py
 
 %build
 # Upstream likes to provide generated *.qm files in the tarballs.
 # Make sure they are recreated from the *.ts files:
 make clean
+
+# The current manpage is not useful.
+rm -r doc/
+# Remove addons which are unlikely to be included in 0.5 final.
+rm -r plugins/{dcoper,devconsole,festival,gpg,ibuddy,network-manager,styler}
+rm -r sounds/{future,xylo}
+rm -r themes/{Grain,TmavoZeleny,rose}
+rm -r chatskins/grom_elegant_2
+
 make PREFIX=%{_prefix}
 
 %install
@@ -83,6 +98,14 @@
 
 
 %changelog
+* Mon Apr 13 2009 Michal Schmidt <mschmidt at redhat.com> - 0.5-0.5.svn20090408
+- Update to SVN rev. 4103:
+  - bugfixes for filetransfer, uniemoticons, logging
+  - faster loading of avatars after login
+- Install only the addons likely to be included in 0.5 final release.
+- Hardcode the SVN revision into self.version.
+- Prefer %%global over %%define.
+
 * Sat Mar 14 2009 Michal Schmidt <mschmidt at redhat.com> - 0.5-0.4.svn20090314
 - Update to current SVN snapshot.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	14 Mar 2009 15:02:18 -0000	1.23
+++ sources	13 Apr 2009 14:01:03 -0000	1.24
@@ -1 +1 @@
-676f2968046ace7d67544030d9cc63bc  jabbim-svn20090314.tar.bz2
+9405f481a8a06060fbc4cb909e54d584  jabbim-svn20090408.tar.bz2