rpms/jabbim/F-8 jabbim-0.4-autoupdate-disable-notification.diff, 1.1, 1.2 jabbim.spec, 1.5, 1.6 sources, 1.5, 1.6 jabbim-0.4-lost-initial-message-if-empty-sender-mood.diff, 1.1, NONE

[Michal Schmidt (michich)]

Author: michich

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

Modified Files:
	jabbim-0.4-autoupdate-disable-notification.diff jabbim.spec 
	sources 
Removed Files:
	jabbim-0.4-lost-initial-message-if-empty-sender-mood.diff 
Log Message:
* Wed Jun 25 2008 Michal Schmidt <mschmidt at redhat.com> - 0.4.2-1
- Upstream release 0.4.2.
- dropped jabbim-0.4-lost-initial-message-if-empty-sender-mood.diff,
  now upstream


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

Index: jabbim-0.4-autoupdate-disable-notification.diff
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/F-8/jabbim-0.4-autoupdate-disable-notification.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jabbim-0.4-autoupdate-disable-notification.diff	13 Jun 2008 09:46:06 -0000	1.1
+++ jabbim-0.4-autoupdate-disable-notification.diff	25 Jun 2008 13:55:43 -0000	1.2
@@ -2,17 +2,25 @@
 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):
+diff -up jabbim-0.4.2/plugins/autoupdate/autoupdate.py.orig jabbim-0.4.2/plugins/autoupdate/autoupdate.py
+--- jabbim-0.4.2/plugins/autoupdate/autoupdate.py.orig	2008-06-25 15:15:23.000000000 +0200
++++ jabbim-0.4.2/plugins/autoupdate/autoupdate.py	2008-06-25 15:15:12.000000000 +0200
+@@ -69,11 +69,11 @@ 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)
+-			self.main.tray.showMessage(self.tr("Autoupdate"),self.tr("New version of Jabbim is available! Get it from www.jabbim.cz"), QtGui.QSystemTrayIcon.Information, 5000)
+-			self.main.events.addBooleanEvent(self.getNewVersion, [], None, [], self.tr('Jabbim update'), text = self.tr("Do you want to download new version?"), name = u'updateJabbim', typ='update')
+-
+-	def getNewVersion(self):
+-		QtGui.QDesktopServices.openUrl(QtCore.QUrl('http://dev.jabbim.cz/releases/detect.php?rel='+self.main.client.version))
 +#		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)
++#			self.main.tray.showMessage(self.tr("Autoupdate"),self.tr("New version of Jabbim is available! Get it from www.jabbim.cz"), QtGui.QSystemTrayIcon.Information, 5000)
++#			self.main.events.addBooleanEvent(self.getNewVersion, [], None, [], self.tr('Jabbim update'), text = self.tr("Do you want to download new version?"), name = u'updateJabbim', typ='update')
++#
++#	def getNewVersion(self):
++#		QtGui.QDesktopServices.openUrl(QtCore.QUrl('http://dev.jabbim.cz/releases/detect.php?rel='+self.main.client.version))
  	


Index: jabbim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/F-8/jabbim.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jabbim.spec	24 Jun 2008 11:49:01 -0000	1.5
+++ jabbim.spec	25 Jun 2008 13:55:43 -0000	1.6
@@ -1,19 +1,18 @@
 Name:		jabbim
-Version:	0.4.1
-Release:	3%{?dist}
+Version:	0.4.2
+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 3014 svn://dev.jabbim.cz/jabbim/branch/0.4.1 jabbim-0.4.1
-# tar -cjf jabbim-0.4.1.tar.bz2 jabbim-0.4.1/
-Source0:	jabbim-0.4.1.tar.bz2
+# svn export svn://dev.jabbim.cz/jabbim/tags/0.4.2 jabbim-0.4.2
+# tar -cjf jabbim-0.4.2.tar.bz2 jabbim-0.4.2/
+Source0:	jabbim-0.4.2.tar.bz2
 Source1:	jabbim.in
 Patch0:		jabbim-0.4-autoupdate-disable-notification.diff
 Patch1:		jabbim-0.4-tune-do-not-offer-Winamp.diff
-Patch2:		jabbim-0.4-lost-initial-message-if-empty-sender-mood.diff
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -41,7 +40,6 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p0
 # fill in the template for the starting script
 sed -e 's|@JABBIMDATA@|%{jabbimdata}|g' %{SOURCE1} > jabbim
 
@@ -116,6 +114,11 @@
 
 
 %changelog
+* Wed Jun 25 2008 Michal Schmidt <mschmidt at redhat.com> - 0.4.2-1
+- Upstream release 0.4.2.
+- dropped jabbim-0.4-lost-initial-message-if-empty-sender-mood.diff,
+  now upstream
+
 * Tue Jun 24 2008 Michal Schmidt <mschmidt at redhat.com> - 0.4.1-3
 - Add upstream patch to prevent initial message loss if sender's mood is empty.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/F-8/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Jun 2008 11:44:38 -0000	1.5
+++ sources	25 Jun 2008 13:55:43 -0000	1.6
@@ -1 +1 @@
-eec30a5803d0f9220adb75035c708638  jabbim-0.4.1.tar.bz2
+edadb3dcbab7bac5b5b65b819bbc516a  jabbim-0.4.2.tar.bz2


--- jabbim-0.4-lost-initial-message-if-empty-sender-mood.diff DELETED ---