rpms/jabbim/F-9 jabbim-0.4-autoupdate-disable-notification.diff, NONE, 1.1 jabbim-0.4-tune-do-not-offer-Winamp.diff, NONE, 1.1 jabbim.spec, 1.16, 1.17 sources, 1.16, 1.17

[Michal Schmidt (michich)]

Author: michich

Update of /cvs/pkgs/rpms/jabbim/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32763

Modified Files:
	jabbim.spec sources 
Added Files:
	jabbim-0.4-autoupdate-disable-notification.diff 
	jabbim-0.4-tune-do-not-offer-Winamp.diff 
Log Message:
* Fri Jun 13 2008 Michal Schmidt <mschmidt at redhat.com> - 0.4-1
- Upstream release 0.4 "VELES".


jabbim-0.4-autoupdate-disable-notification.diff:

--- NEW FILE jabbim-0.4-autoupdate-disable-notification.diff ---
Disable notification of new upstream version availability in the autoupdate plugin.
Users will receive new Jabbim versions via Fedora updates.
 - Michal

diff -up jabbim-0.4/plugins/autoupdate/autoupdate.py.orig jabbim-0.4/plugins/autoupdate/autoupdate.py
--- jabbim-0.4/plugins/autoupdate/autoupdate.py.orig	2008-06-13 10:39:41.000000000 +0200
+++ jabbim-0.4/plugins/autoupdate/autoupdate.py	2008-06-13 10:41:22.000000000 +0200
@@ -69,7 +69,7 @@ class Plugin(plugins.PluginBase):
 
 	def _update(self, vysledek):
 		print vysledek
-		if vysledek[0][0] == False:
-			#nemame posledni verzi
-			self.main.tray.showMessage(self.tr("Autoupdate"),self.tr("New version of Jabbim is available!"), QtGui.QSystemTrayIcon.Information, 3000)
+#		if vysledek[0][0] == False:
+#			#nemame posledni verzi
+#			self.main.tray.showMessage(self.tr("Autoupdate"),self.tr("New version of Jabbim is available!"), QtGui.QSystemTrayIcon.Information, 3000)
 	

jabbim-0.4-tune-do-not-offer-Winamp.diff:

--- NEW FILE jabbim-0.4-tune-do-not-offer-Winamp.diff ---
Winamp is a win32 player. Do not offer it in the tune plugin.
 - Michal

diff -up jabbim-0.4/plugins/tune/tune.py.orig jabbim-0.4/plugins/tune/tune.py
--- jabbim-0.4/plugins/tune/tune.py.orig	2008-06-13 11:13:23.000000000 +0200
+++ jabbim-0.4/plugins/tune/tune.py	2008-06-13 11:13:58.000000000 +0200
@@ -18,7 +18,7 @@ class config:
 			self.config['player']={'type':'list-single','label':self.main.tr("Player"), 'items':{'Winamp':'winamp' }, 'value':'winamp'}
 			
 		else:
-			self.config['player']={'type':'list-single','label':self.main.tr("Player"), 'items':{'MPD':'mpd', 'Winamp':'winamp', 'Amarok':'amarok','Exaile':'exaile' }, 'value':'amarok'}
+			self.config['player']={'type':'list-single','label':self.main.tr("Player"), 'items':{'MPD':'mpd', 'Amarok':'amarok','Exaile':'exaile' }, 'value':'amarok'}
 
 class Plugin(plugins.PluginBase):
 	def __init__(self, main, homedir, plugindir):


Index: jabbim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/F-9/jabbim.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jabbim.spec	7 Apr 2008 19:16:31 -0000	1.16
+++ jabbim.spec	13 Jun 2008 09:42:02 -0000	1.17
@@ -1,19 +1,18 @@
 Name:		jabbim
 Version:	0.4
-Release:	0.4.20080407svn%{?dist}
+Release:	1%{?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 2563 svn://dev.jabbim.cz/jabbim/trunk jabbim-svn
-# tar -cjf jabbim-svn.tar.bz2 jabbim-svn/
-Source0:	jabbim-svn.tar.bz2
+# svn export svn://dev.jabbim.cz/jabbim/tags/0.4 jabbim-0.4
+# tar -cjf jabbim-0.4.tar.bz2 jabbim-0.4/
+Source0:	jabbim-0.4.tar.bz2
 Source1:	jabbim.in
-# From upstream SVN:
-# svn diff -r 2563:2584 | bzip2 > jabbim-svn-2563-2584.diff.bz2
-Patch0:		jabbim-svn-2563-2584.diff.bz2
+Patch0:		jabbim-0.4-autoupdate-disable-notification.diff
+Patch1:		jabbim-0.4-tune-do-not-offer-Winamp.diff
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -38,8 +37,9 @@
 
 
 %prep
-%setup -q -n jabbim-svn
-%patch -p0 
+%setup -q
+%patch0 -p1
+%patch1 -p1
 # fill in the template for the starting script
 sed -e 's|@JABBIMDATA@|%{jabbimdata}|g' %{SOURCE1} > jabbim
 
@@ -56,21 +56,12 @@
 mkdir -p %{buildroot}/%{_bindir}
 install -p -m 755 jabbim %{buildroot}/%{_bindir}/jabbim
 rm jabbim
-install -p -m 755 plugins/remote/jabbim_remote.py %{buildroot}/%{_bindir}/jabbim_remote
-rm plugins/remote/jabbim_remote.py
 
 # remove the files which are not useful for end-users
 # and files which upstream forgot to remove
-rm jabbim.sh jabbim.pro epydoc.cfg test.py gui-test.py
-rm locales/jabbim_{cs,en,sk,pl,fr}.ts
+rm jabbim.sh jabbim.pro
 rm images/32x32/status/rsvg2png.sh
-rm themes/web2/style.css~
-rm plugins/dcoper/cs.qm
-find plugins -name '*.ts' | xargs rm
-# XXX: what about 'scalable' dir?
-find images -name '*.svg' | xargs rm
-
-chmod +x plugins/format/{textile,markdown}.py
+rm widgets/preferences.py.orig
 
 mkdir -p %{buildroot}/%{jabbimdata}
 # take everything else upstream ships
@@ -109,7 +100,6 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
 %{_bindir}/jabbim
-%{_bindir}/jabbim_remote
 %{_datadir}/applications/fedora-jabbim.desktop
 %{_datadir}/icons/hicolor/*/apps/jabbim.png
 %{_datadir}/pixmaps/jabbim.png
@@ -117,6 +107,9 @@
 
 
 %changelog
+* Fri Jun 13 2008 Michal Schmidt <mschmidt at redhat.com> - 0.4-1
+- Upstream release 0.4 "VELES".
+
 * Mon Apr  7 2008 Michal Schmidt <mschmidt at redhat.com> - 0.4-0.4.20080407svn
 - Patch to upstream SVN revision 2584.
 - Fixes opening of new tabs for private messages in MUC and received messages.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/F-9/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	7 Apr 2008 19:16:31 -0000	1.16
+++ sources	13 Jun 2008 09:42:02 -0000	1.17
@@ -1,2 +1 @@
-95376569f600e7cc6bfb2ca64667c392  jabbim-svn.tar.bz2
-6c6d8b7ac3113a8193c3ab58df054f8b  jabbim-svn-2563-2584.diff.bz2
+e0cb6cff4b473209c5ab7d176b11a3b3  jabbim-0.4.tar.bz2