Hello community, here is the log from the commit of package libopensync for openSUSE:Factory checked in at 2016-06-29 15:09:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libopensync (Old) and /work/SRC/openSUSE:Factory/.libopensync.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libopensync" Changes: -------- --- /work/SRC/openSUSE:Factory/libopensync/libopensync.changes 2013-06-25 17:15:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libopensync.new/libopensync.changes 2016-06-29 15:09:53.000000000 +0200 @@ -1,0 +2,12 @@ +Wed Jun 22 14:32:57 UTC 2016 - [email protected] + +- Drop useless --with-pic (it's only for static libs) + +------------------------------------------------------------------- +Tue Jun 21 07:12:18 UTC 2016 - [email protected] + +- add patch: libopensync-0.22-gcc6.patch + * fix boo#985165 + * fix misleading indentation + +------------------------------------------------------------------- New: ---- libopensync-0.22-gcc6.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libopensync.spec ++++++ --- /var/tmp/diff_new_pack.mrqGf1/_old 2016-06-29 15:09:54.000000000 +0200 +++ /var/tmp/diff_new_pack.mrqGf1/_new 2016-06-29 15:09:54.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libopensync # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,18 +17,12 @@ Name: libopensync -BuildRequires: glib2-devel -BuildRequires: libtool -BuildRequires: libxml2-devel -BuildRequires: python-devel -BuildRequires: sqlite3-devel -BuildRequires: swig -Url: http://www.opensync.org Version: 0.22 Release: 0 Summary: A Platform and Distribution Independent Synchronization Framework License: LGPL-2.1+ -Group: Productivity/Other +Group: Productivity/Networking/Other +Url: http://www.opensync.org Source: %{name}-%{version}.tar.bz2 Patch0: libopensync-wrapper-wno_uninitialized.diff Patch1: libopensync-fix-vcal-reminder.diff @@ -38,8 +32,15 @@ Patch5: libopensync-fixed-unused-variables.diff Patch6: libopensync-swig-2x.patch Patch7: libopensync-wrong-memset.patch +#PATCH-FIX-UPSTREAM fix misleading indentation +Patch8: libopensync-0.22-gcc6.patch +BuildRequires: glib2-devel +BuildRequires: libtool +BuildRequires: libxml2-devel +BuildRequires: python-devel +BuildRequires: sqlite3-devel +BuildRequires: swig BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define prefix /usr %description OpenSync is a synchronization framework that is platform and @@ -67,7 +68,7 @@ %package tools Summary: Tools for libopensync -Group: Productivity/Other +Group: Productivity/Networking/Other Requires: %{name} = %{version} %description tools @@ -77,8 +78,8 @@ %package -n python-opensync Summary: Python bindings for OpenSync -Group: Productivity/Other -Requires: %name = %version +Group: Development/Languages/Python +Requires: %{name} = %{version} %description -n python-opensync OpenSync is a synchronization framework that is platform and @@ -100,24 +101,22 @@ %patch5 -p1 %patch6 %patch7 +%patch8 -p1 + %build autoreconf -sif # -fno-strict-aliasing needed for python wrapper -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Wno-error=deprecated-declarations" -%configure --disable-static --with-pic --libexecdir=%{_libdir}/opensync/ --enable-tools --disable-profiling --disable-unit-tests -%{__make} %{?jobs:-j%jobs} +CFLAGS="%{optflags} -fno-strict-aliasing -Wno-error=deprecated-declarations" +%configure --disable-static --libexecdir=%{_libdir}/opensync/ --enable-tools --disable-profiling --disable-unit-tests +make %{?_smp_mflags} %install -make DESTDIR=$RPM_BUILD_ROOT install -mkdir -p $RPM_BUILD_ROOT/%_libdir/opensync/plugins -mkdir -p $RPM_BUILD_ROOT/%_datadir/opensync/defaults -find %{buildroot} -type f -name "*.la" -exec %{__rm} -fv {} + - -%clean -rm -rf $RPM_BUILD_ROOT +make %{?_smp_mflags} DESTDIR=%{buildroot} install +mkdir -p %{buildroot}/%{_libdir}/opensync/plugins +mkdir -p %{buildroot}/%{_datadir}/opensync/defaults +find %{buildroot} -type f -name "*.la" -delete -print %post -p /sbin/ldconfig - %postun -p /sbin/ldconfig %files ++++++ libopensync-0.22-gcc6.patch ++++++ Index: libopensync-0.22/tools/osyncdump.c =================================================================== --- libopensync-0.22.orig/tools/osyncdump.c +++ libopensync-0.22/tools/osyncdump.c @@ -49,14 +49,17 @@ static void dump_map(OSyncEnv *osync, ch while ((change = changes[i])) { OSyncMember *member = osync_change_get_member(change); int memberid = 0; - if (member) + if (member) { memberid = osync_member_get_id(member); - const char *formatname = NULL; - if (osync_change_get_objformat(change)) + } + const char *formatname = NULL; + if (osync_change_get_objformat(change)) { formatname = osync_objformat_get_name(osync_change_get_objformat(change)); + } const char *objname = NULL; - if (osync_change_get_objtype(change)) + if (osync_change_get_objtype(change)) { objname = osync_objtype_get_name(osync_change_get_objtype(change)); + } printf("ID: %lli UID: %s MEMBER: %i\n\tOBJTYPE: %s OBJFORMAT: %s MAPPINGID: %lli\n", osync_change_get_id(change), osync_change_get_uid(change), memberid, objname, formatname, osync_change_get_mappingid(change)); i++; } Index: libopensync-0.22/tools/osyncstress.c =================================================================== --- libopensync-0.22.orig/tools/osyncstress.c +++ libopensync-0.22/tools/osyncstress.c @@ -184,8 +184,9 @@ void change_content(OSyncEngine *engine) case 2: if (osync_member_delete_data(meminfo->member, chinfo->change)) { printf("Deleting data %s for member %lli. Objtype: %s Format: %s\n", osync_change_get_uid(chinfo->change), osync_member_get_id(meminfo->member), osync_objtype_get_name(osync_change_get_objtype(chinfo->change)), osync_objformat_get_name(osync_change_get_objformat(chinfo->change))); - if (!osync_group_get_slow_sync(engine->group, osync_objtype_get_name(osync_change_get_objtype(chinfo->change)))); + if (!osync_group_get_slow_sync(engine->group, osync_objtype_get_name(osync_change_get_objtype(chinfo->change)))) { chinfo->type = CHANGE_DELETED; + } } break; case 3:
