rpms/jabbim/devel .cvsignore, 1.10, 1.11 jabbim-0.4-autoupdate-disable-notification.diff, 1.2, 1.3 jabbim.spec, 1.21, 1.22 sources, 1.19, 1.20 jabbim-0.4-tune-do-not-offer-Winamp.diff, 1.1, NONE

[Michal Schmidt (michich)]

Author: michich

Update of /cvs/pkgs/rpms/jabbim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15224

Modified Files:
	.cvsignore jabbim-0.4-autoupdate-disable-notification.diff 
	jabbim.spec sources 
Removed Files:
	jabbim-0.4-tune-do-not-offer-Winamp.diff 
Log Message:
* Thu Jul 03 2008 Michal Schmidt <mschmidt at redhat.com> - 0.4.3-1
- Upstream release 0.4.3.
- Dropped the tune plugin patch, now merged.
- Simplified the autoupdate plugin patch. Thanks to upstream changes, it's now
  sufficient to only changes default config values.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	25 Jun 2008 13:21:59 -0000	1.10
+++ .cvsignore	3 Jul 2008 15:27:22 -0000	1.11
@@ -1 +1 @@
-jabbim-0.4.2.tar.bz2
+jabbim-0.4.3.tar.bz2

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

Index: jabbim-0.4-autoupdate-disable-notification.diff
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/devel/jabbim-0.4-autoupdate-disable-notification.diff,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jabbim-0.4-autoupdate-disable-notification.diff	25 Jun 2008 13:21:59 -0000	1.2
+++ jabbim-0.4-autoupdate-disable-notification.diff	3 Jul 2008 15:27:22 -0000	1.3
@@ -1,26 +1,12 @@
-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.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! 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! 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))
- 	
+diff -up jabbim-0.4.3/plugins/autoupdate/autoupdate.py.orig jabbim-0.4.3/plugins/autoupdate/autoupdate.py
+--- jabbim-0.4.3/plugins/autoupdate/autoupdate.py.orig	2008-07-03 16:59:49.000000000 +0200
++++ jabbim-0.4.3/plugins/autoupdate/autoupdate.py	2008-07-03 17:00:03.000000000 +0200
+@@ -27,7 +27,7 @@ class config:
+ 		self.config['check_jabbim'] = {
+ 			'type':'boolean',
+ 			'label':self.main.tr("Notify about new versions of Jabbim"),
+-			'value':'True'
++			'value':'False'
+ 		}
+ 		self.config['check_plugins'] = {
+ 			'type':'boolean',


Index: jabbim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/devel/jabbim.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- jabbim.spec	25 Jun 2008 13:21:59 -0000	1.21
+++ jabbim.spec	3 Jul 2008 15:27:22 -0000	1.22
@@ -1,5 +1,5 @@
 Name:		jabbim
-Version:	0.4.2
+Version:	0.4.3
 Release:	1%{?dist}
 Summary:	Jabber client for mere mortals
 
@@ -7,12 +7,11 @@
 License:	GPLv2+
 URL:		http://dev.jabbim.cz/jabbim
 # The source was obtained from upstream SVN repository:
-# 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
+# svn export svn://dev.jabbim.cz/jabbim/tags/0.4.3 jabbim-0.4.3
+# tar -cjf jabbim-0.4.3.tar.bz2 jabbim-0.4.3/
+Source0:	jabbim-0.4.3.tar.bz2
 Source1:	jabbim.in
 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)
 
@@ -39,7 +38,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 # fill in the template for the starting script
 sed -e 's|@JABBIMDATA@|%{jabbimdata}|g' %{SOURCE1} > jabbim
 
@@ -114,6 +112,12 @@
 
 
 %changelog
+* Thu Jul 03 2008 Michal Schmidt <mschmidt at redhat.com> - 0.4.3-1
+- Upstream release 0.4.3.
+- Dropped the tune plugin patch, now merged.
+- Simplified the autoupdate plugin patch. Thanks to upstream changes, it's now
+  sufficient to only changes default config values.
+
 * 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,


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	25 Jun 2008 13:21:59 -0000	1.19
+++ sources	3 Jul 2008 15:27:22 -0000	1.20
@@ -1 +1 @@
-edadb3dcbab7bac5b5b65b819bbc516a  jabbim-0.4.2.tar.bz2
+bf9973631495cea7a21e625f76fa2545  jabbim-0.4.3.tar.bz2


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