rpms/jabbim/F-12 .cvsignore, 1.16, 1.17 jabbim.spec, 1.39, 1.40 sources, 1.27, 1.28

[Michal Schmidt]

Author: michich

Update of /cvs/pkgs/rpms/jabbim/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv23208

Modified Files:
	.cvsignore jabbim.spec sources 
Log Message:
* Sat Jun 12 2010 Michal Schmidt <mschmidt at redhat.com> 0.5.1-1.svn20100612
- Upstream release 0.5.1 + fixes from 0.5.x stable branch.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/F-12/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	7 Sep 2009 14:26:22 -0000	1.16
+++ .cvsignore	11 Jun 2010 23:39:50 -0000	1.17
@@ -1 +1 @@
-jabbim-svn20090907.tar.xz
+jabbim-0.5.x-svn20100612.tar.xz


Index: jabbim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/F-12/jabbim.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- jabbim.spec	1 Feb 2010 22:23:47 -0000	1.39
+++ jabbim.spec	11 Jun 2010 23:39:50 -0000	1.40
@@ -1,17 +1,17 @@
-%global	svnrev	4243
-%global	svndate	20100201
+%global	svnrev	4326
+%global	svndate	20100612
 Name:		jabbim
-Version:	0.5
-Release:	0.13.svn%{svndate}%{?dist}
+Version:	0.5.1
+Release:	1.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 %{svnrev} svn://dev.jabbim.cz/jabbim/trunk jabbim-svn%{svndate}
-# tar -cJf jabbim-svn%{svndate}.tar.xz jabbim-svn%{svndate}/
-Source0:	jabbim-svn%{svndate}.tar.xz
+# svn export -r %{svnrev} svn://dev.jabbim.cz/jabbim/branch/0.5.x jabbim-0.5.x-svn%{svndate}
+# tar -cJf jabbim-0.5.x-svn%{svndate}.tar.xz jabbim-0.5.x-svn%{svndate}/
+Source0:	jabbim-0.5.x-svn%{svndate}.tar.xz
 Patch0:		jabbim-0.4-autoupdate-disable-notification.diff
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -39,10 +39,10 @@ with the advanced functionality provided
 
 
 %prep
-%setup -q -n jabbim-svn%{svndate}
+%setup -q -n jabbim-0.5.x-svn%{svndate}
 %patch0 -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}%{?dist}'#" jabbim.py
+sed -i -e "s#\\(self.version = '0.5.1'\\)#\\1 + ' - rev. %{svnrev}%{?dist}'#" jabbim.py
 
 %build
 # Upstream likes to provide generated *.qm files in the tarballs.
@@ -96,6 +96,9 @@ fi
 
 
 %changelog
+* Sat Jun 12 2010 Michal Schmidt <mschmidt at redhat.com> 0.5.1-1.svn20100612
+- Upstream release 0.5.1 + fixes from 0.5.x stable branch.
+
 * Mon Feb 01 2010 Michal Schmidt <mschmidt at redhat.com> 0.5-0.13.svn20100201
 - Update to svn rev. 4243.
 - Fixes a few bugs reported by abrt and some more.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/F-12/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	1 Feb 2010 22:23:47 -0000	1.27
+++ sources	11 Jun 2010 23:39:50 -0000	1.28
@@ -1 +1 @@
-00f1352dbb9a17bd94c3904458fc5be9  jabbim-svn20100201.tar.xz
+b44bd825ffe0052f72a5119d3a7b74f9  jabbim-0.5.x-svn20100612.tar.xz