rpms/telepathy-gabble/OLPC-2 .cvsignore, 1.30, 1.31 sources, 1.30, 1.31 telepathy-gabble.spec, 1.42, 1.43

[Simon McVittie (smcv)]

Author: smcv

Update of /cvs/pkgs/rpms/telepathy-gabble/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28583

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
0.7.0-0.2.olpc2 (dev.laptop.org #4694, #4696)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/OLPC-2/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	2 Nov 2007 20:52:22 -0000	1.30
+++ .cvsignore	8 Nov 2007 18:14:45 -0000	1.31
@@ -1 +1 @@
-telepathy-gabble-0.6.999.1-olpc20071102.tar.gz
+telepathy-gabble-0.7.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/OLPC-2/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	2 Nov 2007 20:52:22 -0000	1.30
+++ sources	8 Nov 2007 18:14:45 -0000	1.31
@@ -1 +1 @@
-7d8b865150b38642589f1aa4b8e4ada1  telepathy-gabble-0.6.999.1-olpc20071102.tar.gz
+2921cea222498b5806b845661e609a21  telepathy-gabble-0.7.0.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/OLPC-2/telepathy-gabble.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- telepathy-gabble.spec	2 Nov 2007 20:52:22 -0000	1.42
+++ telepathy-gabble.spec	8 Nov 2007 18:14:45 -0000	1.43
@@ -1,30 +1,28 @@
-# This is a snapshot release of the olpc1.0 branch of telepathy-gabble
-# Code can be found for this branch at 
-# http://projects.collabora.co.uk/~monkey/telepathy-gabble-olpc1.0/
-%define alphatag olpc20071102
-
-%define telepathy_glib_version 0.5.14
+#%define alphatag olpc20071102
 
 Name:           telepathy-gabble
-Version:        0.6.999.1
-Release:        0.2.%{alphatag}%{?dist}
+Version:        0.7.0
+Release:        0.2%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
 Group:          Applications/Communications
-License:        LGPL
+# The entire source code is LGPLv2+, except src/libmd5-rfc/ and src/sha1/ which are BSD.
+License:        LGPLv2+ and (BSD)
 URL:            http://telepathy.freedesktop.org/wiki/
-Source0:        http://projects.collabora.co.uk/~smcv/olpc-snapshots/%{name}-%{version}-%{alphatag}.tar.gz
-Patch0:         telepathy-gabble-0.5.12.1-no-Werror.patch
+#Source0:        http://projects.collabora.co.uk/~smcv/olpc-snapshots/%{name}-%{version}-%{alphatag}.tar.gz
+Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
+#Patch0:         telepathy-gabble-0.5.12.1-no-Werror.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-devel
-BuildRequires:  dbus-glib-devel
-BuildRequires:  loudmouth-devel
-BuildRequires:  telepathy-glib-devel >= %{telepathy_glib_version}
-BuildRequires:  libxslt-devel
+BuildRequires:  dbus-glib-devel >= 0.72
+BuildRequires:  loudmouth-devel >= 1.1.1
+BuildRequires:  telepathy-glib-devel >= 0.5.14
+BuildRequires:  libxslt
+BuildRequires:  python
 
-Requires:       telepathy-filesystem
+Requires:		telepathy-filesystem
 
 
 %description
@@ -33,8 +31,10 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-%{alphatag}
-%patch0 -p1 -b .no-Werror
+%setup -q
+# for non-release builds only:
+# -n %{name}-%{version}-%{alphatag}
+#%patch0 -p1 -b .no-Werror
 
 %build
 %configure
@@ -59,6 +59,11 @@
 
 
 %changelog
+* Thu Nov 08 2007 Simon McVittie <simon.mcvittie at collabora.co.uk> - 0.7.0-0.2
+- Update to 0.7.0 upstream release (laptop.org #4696)
+  - Fixes an error in activity advertisement (#4694)
+- Reduce divergence between this spec file and the one for Fedora 8 (thanks Brian Pepple)
+
 * Fri Nov 02 2007 Simon McVittie <simon.mcvittie at collabora.co.uk> - 0.6.999.1-0.2.olpc20071102
 - New snapshot
 - Fix assertion failure during shutdown