rpms/telepathy-salut/OLPC-2 .cvsignore, 1.17, 1.18 sources, 1.17, 1.18 telepathy-salut.spec, 1.22, 1.23

[Simon McVittie (smcv)]

Author: smcv

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

Modified Files:
	.cvsignore sources telepathy-salut.spec 
Log Message:
Update to upstream version, 0.1.6-0.8olpc2 (dev.laptop.org #4437)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-salut/OLPC-2/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	8 Nov 2007 11:25:58 -0000	1.17
+++ .cvsignore	8 Nov 2007 18:06:42 -0000	1.18
@@ -1,2 +1 @@
-telepathy-salut-0.1.5.1-olpc20071102.2.tar.gz
-telepathy-salut-0.1.5.1-olpc20071106.1.tar.gz
+telepathy-salut-0.1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-salut/OLPC-2/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	8 Nov 2007 11:25:58 -0000	1.17
+++ sources	8 Nov 2007 18:06:42 -0000	1.18
@@ -1,2 +1 @@
-26bd1f074c038234f838890bd0b64cb5  telepathy-salut-0.1.5.1-olpc20071102.2.tar.gz
-03d045466b76b2e928067626c05a71ae  telepathy-salut-0.1.5.1-olpc20071106.1.tar.gz
+b15f09efe233d4fa1517a8eb8d2166e8  telepathy-salut-0.1.6.tar.gz


Index: telepathy-salut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-salut/OLPC-2/telepathy-salut.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- telepathy-salut.spec	8 Nov 2007 11:25:58 -0000	1.22
+++ telepathy-salut.spec	8 Nov 2007 18:06:42 -0000	1.23
@@ -1,26 +1,23 @@
-%define alpha olpc20071106.1
-
-%define telepathy_glib_version 0.5.14
-
 Name:           telepathy-salut
-Version:        0.1.5.1
-Release:        0.7.%{alpha}%{?dist}
+Version:        0.1.6
+Release:        0.8%{?dist}
 Summary:        Link-local XMPP telepathy connection manager
 
 Group:          Applications/Communications
-License:        LGPL
+License:        LGPLv2+
 URL:            http://telepathy.freedesktop.org/wiki/FrontPage
-Source0:        %{name}-%{version}-%{alpha}.tar.gz
+Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  dbus-devel >= 0.61
-BuildRequires:	dbus-glib-devel
+BuildRequires:  dbus-devel >= 1.1.0
+BuildRequires:	dbus-glib-devel >= 0.61
 BuildRequires:	avahi-glib-devel
 BuildRequires:	libxml2-devel
 BuildRequires:	openssl-devel
 BuildRequires:	cyrus-sasl-devel
 BuildRequires:	libxslt
-BuildRequires:	telepathy-glib-devel >= %{telepathy_glib_version}
+BuildRequires:	telepathy-glib-devel >= 0.5.14
+BuildRequires:	check-devel
 
 Requires:	telepathy-filesystem
 
@@ -33,7 +30,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-%{alpha}
+%setup -q
 
 
 %build
@@ -56,9 +53,16 @@
 %{_libexecdir}/%{name}
 %{_datadir}/dbus-1/services/*.service
 %{_datadir}/telepathy/managers/*.manager
-
+%{_mandir}/man8/%{name}.8.gz
 
 %changelog
+* Thu Nov 08 2007 Simon McVittie <simon.mcvittie at collabora.co.uk> - 0.1.6-0.8
+- dev.laptop.org #4437: sync with new upstream release, after code review
+  - fix a memory leak
+  - miscellaneous coding-style cleanup
+- sync spec file with Fedora 8 0.1.6-1 (thanks, Brian Pepple); the only
+  OLPC-specific change is now --enable-olpc
+
 * Thu Nov 08 2007 Simon McVittie <simon.mcvittie at collabora.co.uk> - 0.1.5.1-0.7.olpc20071106.1
 - dev.laptop.org #4402: Make contacts go offline 20 minutes after the
   Avahi resolver marks them as failed. Background: what we'd usually do is