Hello community, here is the log from the commit of package csync for openSUSE:13.1 checked in at 2013-09-25 14:30:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1/csync (Old) and /work/SRC/openSUSE:13.1/.csync.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "csync" Changes: -------- --- /work/SRC/openSUSE:13.1/csync/csync.changes 2013-09-23 10:49:17.000000000 +0200 +++ /work/SRC/openSUSE:13.1/.csync.new/csync.changes 2013-09-25 14:30:24.000000000 +0200 @@ -1,0 +2,14 @@ +Fri Sep 13 12:19:12 UTC 2013 - jmcdonough@suse.com + +- Update to version 0.50.0. + * Added an owncloud module + * Added a backup mode to the reconciler + * Added new logging framework (removed log4c dependency) + * Added new config parser (removed iniparser dependency) + * Added capabilities for modules + * Added content checking in conflict case + * Improved database performance and integrity checks + * Improved error reporting +- Add fix-cmake-on-pre-12.patch: Fix building on older systems + +------------------------------------------------------------------- Old: ---- csync-0.44.0.tar.bz2 New: ---- csync-0.50.0.tar.bz2 fix-cmake-on-pre-12.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ csync.spec ++++++ --- /var/tmp/diff_new_pack.zR4Bet/_old 2013-09-25 14:30:24.000000000 +0200 +++ /var/tmp/diff_new_pack.zR4Bet/_new 2013-09-25 14:30:24.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package csync (Version 0.44.0) +# spec file for package csync # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,25 +15,28 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: csync -BuildRequires: cmake doxygen gcc-c++ libiniparser-devel liblog4c-devel -BuildRequires: libsmbclient-devel libssh-devel +BuildRequires: cmake +BuildRequires: doxygen +BuildRequires: gcc-c++ +BuildRequires: libsmbclient-devel +BuildRequires: libssh-devel %if 0%{?suse_version} BuildRequires: sqlite3-devel %else BuildRequires: sqlite-devel %endif +Version: 0.50.0 +Release: 0 +Summary: A user level bidirectional client only file synchronizer License: GPL-2.0+ Group: Productivity/Networking/Other -Version: 0.44.0 -Release: 1 -Summary: A user level bidirectional client only file synchronizer Url: http://www.csync.org/ Source0: %{name}-%{version}.tar.bz2 Source1: baselibs.conf +# PATCH-FIX-OPENSUSE fix-cmake-on-pre-12.patch +Patch0: fix-cmake-on-pre-12.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -42,8 +45,8 @@ of libsmbclient in Samba/Windows environments. %package -n libcsync0 -License: GPL-2.0+ Summary: A user level bidirectional client only file synchronizer +License: LGPL-2.1+ Group: System/Libraries %if 0%{?suse_version} > 1030 Recommends: libcsync-plugin-smb @@ -56,8 +59,8 @@ of libsmbclient in Samba/Windows environments. %package -n libcsync-plugin-smb -License: GPL-2.0+ Summary: SMB plugin for csync +License: GPL-2.0+ Group: System/Libraries Requires: libcsync0 = %{version} @@ -66,8 +69,8 @@ Samba or Windows server. %package -n libcsync-plugin-sftp -License: GPL-2.0+ Summary: A user level bidirectional client only file synchronizer +License: GPL-2.0+ Group: Productivity/Networking/Other Requires: libcsync0 = %{version} @@ -76,9 +79,21 @@ feature of roaming home directories for Linux clients. csync makes use of libsmbclient in Samba/Windows environments. -%package -n libcsync-devel +%if 0%{?suse_version} >= 1200 +%package -n libcsync-plugin-owncloud +Summary: Owncloud plugin for csync License: GPL-2.0+ +Group: System/Libraries +Requires: libcsync0 = %{version} +BuildRequires: libneon-devel + +%description -n libcsync-plugin-owncloud +This plug-in allows applications using csync to synchronize with Owncloud. +%endif + +%package -n libcsync-devel Summary: Development files for csync +License: GPL-2.0+ Group: Development/Libraries/C and C++ Requires: libcsync0 = %{version} @@ -87,8 +102,8 @@ files needed for development with csync. %package -n libcsync-devel-doc -License: GPL-2.0+ Summary: Developer documentation for csync +License: GPL-2.0+ Group: Development/Languages/C and C++ %description -n libcsync-devel-doc @@ -96,8 +111,8 @@ development. %package -n libcsync-doc -License: GPL-2.0+ Summary: User documentation for csync +License: GPL-2.0+ Group: Development/Languages/C and C++ %description -n libcsync-doc @@ -105,6 +120,9 @@ %prep %setup -q +%if 0%{?suse_version} < 1200 +%patch0 -p1 +%endif %build if test ! -e "build"; then @@ -155,7 +173,6 @@ %dir %{_sysconfdir}/csync %config(noreplace) %{_sysconfdir}/csync/csync.conf %config(noreplace) %{_sysconfdir}/csync/csync_exclude.conf -%config(noreplace) %{_sysconfdir}/csync/csync_log.conf %{_libdir}/libcsync.so.* %dir %{_libdir}/csync-0 @@ -167,6 +184,12 @@ %defattr(-,root,root) %{_libdir}/csync-0/csync_sftp.so +%if 0%{?suse_version} >= 1200 +%files -n libcsync-plugin-owncloud +%defattr(-,root,root) +%{_libdir}/csync-0/csync_owncloud.so +%endif + %files -n libcsync-devel %defattr(-,root,root) %{_includedir}/csync ++++++ csync-0.44.0.tar.bz2 -> csync-0.50.0.tar.bz2 ++++++ ++++ 28200 lines of diff (skipped) ++++++ fix-cmake-on-pre-12.patch ++++++ Index: csync-0.50.0/cmake/Modules/DefineCompilerFlags.cmake =================================================================== --- csync-0.50.0.orig/cmake/Modules/DefineCompilerFlags.cmake +++ csync-0.50.0/cmake/Modules/DefineCompilerFlags.cmake @@ -10,7 +10,7 @@ if (UNIX AND NOT WIN32) if (${CMAKE_C_COMPILER_ID} MATCHES "(GNU|Clang)") # add -Wconversion ? - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -pedantic -pedantic-errors") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -pedantic") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wshadow -Wmissing-prototypes -Wdeclaration-after-statement") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wunused -Wfloat-equal -Wpointer-arith -Wwrite-strings -Wformat-security") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-format-attribute") @@ -28,7 +28,7 @@ if (UNIX AND NOT WIN32) if (CMAKE_BUILD_TYPE) string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER) - if (CMAKE_BUILD_TYPE_LOWER MATCHES (release|relwithdebinfo|minsizerel)) + if (CMAKE_BUILD_TYPE_LOWER MATCHES "(release|relwithdebinfo|minsizerel)") check_c_compiler_flag("-Wp,-D_FORTIFY_SOURCE=2" WITH_FORTIFY_SOURCE) if (WITH_FORTIFY_SOURCE) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wp,-D_FORTIFY_SOURCE=2") Index: csync-0.50.0/cmake/Modules/FindIconv.cmake =================================================================== --- csync-0.50.0.orig/cmake/Modules/FindIconv.cmake +++ csync-0.50.0/cmake/Modules/FindIconv.cmake @@ -16,7 +16,6 @@ include(CheckIncludeFile) include(CheckFunctionExists) include(CheckLibraryExists) -include(CheckPrototypeDefinition) find_path(ICONV_INCLUDE_DIR NAMES @@ -52,11 +51,6 @@ if (HAVE_ICONV_H OR HAVE_SYS_ICONV_H) endif (HAVE_SYS_ICONV_H) set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR}) - check_prototype_definition(iconv - "size_t iconv(iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft)" - "-1" - ${_ICONV_PROTO_INCLUDE} - HAVE_ICONV_CONST) set(CMAKE_REQUIRED_INCLUDES) endif (HAVE_ICONV_H OR HAVE_SYS_ICONV_H) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org