rpms/osso-gwobex/F-12 0001-Fix-typo-in-incomming.patch, NONE, 1.1 0002-Always-use-nice-abort.patch, NONE, 1.1 osso-gwobex.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Bastien Nocera
hadess at fedoraproject.org
Mon Mar 1 16:51:50 UTC 2010
Author: hadess
Update of /cvs/pkgs/rpms/osso-gwobex/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6795
Modified Files:
.cvsignore sources
Added Files:
0001-Fix-typo-in-incomming.patch
0002-Always-use-nice-abort.patch osso-gwobex.spec
Log Message:
* Thu Feb 18 2010 Bastien Nocera <bnocera at redhat.com> 0.64-2.bef6bc21
- Modifications from the package review
0001-Fix-typo-in-incomming.patch:
obex-priv.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- NEW FILE 0001-Fix-typo-in-incomming.patch ---
>From 0ad3be526ebedf87cbe80f068fe0e5b5cb6a5c72 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Thu, 18 Feb 2010 01:05:25 +0000
Subject: [PATCH 1/2] Fix typo in "incomming"
---
src/obex-priv.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/obex-priv.c b/src/obex-priv.c
index a8b12ea..f99740a 100644
--- a/src/obex-priv.c
+++ b/src/obex-priv.c
@@ -371,7 +371,7 @@ static void obex_readstream(GwObex *ctx, obex_object_t *object) {
int actual;
if (!xfer) {
- debug("Incomming data even though no xfer active!\n");
+ debug("Incoming data even though no xfer active!\n");
/* Flush incomming stream */
actual = OBEX_ObjectReadStream(ctx->handle, object, &buf);
if (actual > 0)
--
1.6.6.1
0002-Always-use-nice-abort.patch:
configure.ac | 5 -----
src/obex-xfer.c | 9 ---------
2 files changed, 14 deletions(-)
--- NEW FILE 0002-Always-use-nice-abort.patch ---
>From 4812cec279691aa057540abad443d2ccf9aff6ea Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Thu, 18 Feb 2010 01:05:37 +0000
Subject: [PATCH 2/2] Always use "nice abort"
So we don't disconnect when cancelling a request.
---
configure.ac | 5 -----
src/obex-xfer.c | 8 --------
2 files changed, 0 insertions(+), 13 deletions(-)
diff --git a/configure.ac b/configure.ac
index 9d2c19f..a915ec7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,7 +38,6 @@ AC_SUBST(LDFLAGS)
AC_ARG_ENABLE(docs, [ --enable-docs build DOXYGEN documentation (requires Doxygen)],enable_docs=$enableval,enable_docs=auto)
AC_ARG_ENABLE(tracing, [ --enable-tracing Enable debuging information],enable_tracing=$enableval,enable_tracing=no)
-AC_ARG_ENABLE(niceabort, [ --enable-niceabort Enable proper abort],enable_niceabort=$enableval,enable_niceabort=no)
AC_ARG_ENABLE(localtime, [ --enable-localtime Send time as local instead of UTC],enable_localtime=$enableval,enable_localtime=no)
AC_ARG_ENABLE(coverage, [ --enable-coverage Enable coverage], enable_coverage=$enableval, enable_coverage=no)
@@ -98,10 +97,6 @@ else
AC_MSG_RESULT(no)
fi
-if (test x$enable_niceabort = xyes); then
- AC_DEFINE(USE_NICE_ABORT, 1, [Enable nice abort support.])
-fi
-
if (test x$enable_localtime = xyes); then
AC_DEFINE(USE_LOCALTIME, 1, [Send time as local instead of UTC.])
fi
diff --git a/src/obex-xfer.c b/src/obex-xfer.c
index 38a2f4f..81ac5dc 100644
--- a/src/obex-xfer.c
+++ b/src/obex-xfer.c
@@ -98,18 +98,10 @@ gboolean gw_obex_xfer_do_abort(struct gw_obex_xfer *xfer) {
xfer->abort = TRUE;
-#ifdef USE_NICE_ABORT
debug("Performing nice abort\n");
if (OBEX_CancelRequest(xfer->ctx->handle, TRUE) != 0)
return FALSE;
return TRUE;
-#else
- debug("Performing abort through disconnection (without ABORT command)\n");
- xfer->ctx->done = TRUE;
- OBEX_CancelRequest(xfer->ctx->handle, FALSE);
- obex_link_error(xfer->ctx);
- return FALSE;
-#endif
}
GwObexXfer *gw_obex_put_async(GwObex *ctx, const char *name, const char *type,
--
1.6.6.1
--- NEW FILE osso-gwobex.spec ---
Name: osso-gwobex
Version: 0.64
Release: 2.bef6bc21%{?dist}
Summary: Obex helper library
Group: System Environment/Libraries
License: LGPLv2
# And in non-git at:
# http://maemo.gitorious.org/maemo-bluetooth/osso-gwobex
URL: git://gitorious.org/maemo-bluetooth/osso-gwobex.git
# http://maemo.gitorious.org/maemo-bluetooth/osso-gwobex/archive-tarball/bef6bc21
# Note that you'll need to try and access the file a few times, as it's
# generated on-the-fly
Source0: maemo-bluetooth-osso-gwobex-bef6bc21.tar.gz
Patch0: 0001-Fix-typo-in-incomming.patch
Patch1: 0002-Always-use-nice-abort.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: glib2-devel
BuildRequires: openobex-devel
BuildRequires: doxygen
BuildRequires: autoconf automake libtool
%description
osso-gwobex contains a GLib helper library for ObexFTP and
ObexPush access.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
License: LGPLv2+
Requires: %{name} = %{version}-%{release}
Requires: glib2-devel pkgconfig
%description devel
This package contains the libraries and header files that are needed
for writing applications that use ObexPush and ObexFTP.
%prep
%setup -q -n maemo-bluetooth-osso-gwobex
%patch0 -p1 -b .typo
%patch1 -p1 -b .nice-abort
%build
autoreconf -v --force --install
%configure --enable-docs=yes
make %{?_smp_mflags}
doxygen doxygen.cfg
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
cp -a debian/changelog ChangeLog
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a $RPM_BUILD_ROOT/%{_libdir}/*.la
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc AUTHORS README ChangeLog
%{_libdir}/libgwobex.so.*
%files devel
%defattr(-,root,root,-)
%doc doc/
%{_includedir}/gw-obex.h
%{_libdir}/libgwobex.so
%{_libdir}/pkgconfig/libgwobex.pc
%changelog
* Thu Feb 18 2010 Bastien Nocera <bnocera at redhat.com> 0.64-2.bef6bc21
- Modifications from the package review
* Thu Feb 18 2010 Bastien Nocera <bnocera at redhat.com> 0.64-1.bef6bc21
- First version
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/osso-gwobex/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore 19 Feb 2010 20:11:50 -0000 1.1
+++ .cvsignore 1 Mar 2010 16:51:49 -0000 1.2
@@ -0,0 +1 @@
+maemo-bluetooth-osso-gwobex-bef6bc21.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/osso-gwobex/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources 19 Feb 2010 20:11:50 -0000 1.1
+++ sources 1 Mar 2010 16:51:50 -0000 1.2
@@ -0,0 +1 @@
+586571b59ec4b7c1be46c808b93bcb4a maemo-bluetooth-osso-gwobex-bef6bc21.tar.gz
More information about the scm-commits
mailing list