commit deja-dup for openSUSE:Factory
Hello community, here is the log from the commit of package deja-dup for openSUSE:Factory checked in at 2014-09-28 19:55:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/deja-dup (Old) and /work/SRC/openSUSE:Factory/.deja-dup.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "deja-dup" Changes: -------- --- /work/SRC/openSUSE:Factory/deja-dup/deja-dup.changes 2013-12-26 17:36:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.deja-dup.new/deja-dup.changes 2014-09-28 19:55:25.000000000 +0200 @@ -1,0 +2,52 @@ +Fri Sep 26 07:22:41 UTC 2014 - zaitor@opensuse.org + +- Update to version 32.0: + + Features: Drop support for Ubuntu One cloud storage, since it + has shut down. + + Packaging: Fix some compile issues and warnings. + + Updated translations. + +------------------------------------------------------------------- +Sat Aug 9 19:26:09 UTC 2014 - sfalken@opensuse.org + +- Update to version 30.0: + + Packaging: Fix build with CMake 2.8.12. +- Changes from version 29.5: + + Bug Fixes: Re-enable libunity support after it was + accidentally dropped in 29.1. + + Packaging: Require duplicity 0.6.23. +- Changes from version 29.4: + + Bug Fixes: Add missing icon in help documentation. + + Packaging: + - Add ENABLE_UNITY_CCPANEL argument for unity-control-center + support. + - Fix some compile problems with valac, parallel building, and + rpath support. +- Changes from version 29.1: + + Bug Fixes: Detect encryption on existing backups by paying + attention to what Duplicity tells us, rather than trying to + figure it out by scanning ourselves. This removes a possible + source of error. + + Polish: + - Rename to Backups (instead of Backup). + - Update look and feel of preferences a bit. + - Add screenshots to appdata file. + + Packaging: + - Require GTK+ 3.6 and GLib 2.34. + - Convert from autotools to cmake: --with-ccpanel is now + -DENABLE_CCPANEL, --with-nautilus is now -DENABLE_NAUTILUS, + --with-unity is now -DENABLE_UNITY. Otherwise, normal cmake + conventions apply. + - Add some autopilot tests, runnable by 'autopilot' and + 'autopilot-system' targets (which test against the local + built executables or the installed system ones respectively). + + Updated translations. +- Add deja-dup-help2man_stderr.patch: Corrects help2man failure in + build. +- Drop deja-dup-vala-0.22.patch: Incorporated upstream. +- Updated .spec file for new CMake build process: add cmake + BuildRequires. +- Add -Wl,rpath to CFLAGS and CXXFLAGS to ensure we do not lose + the path to the private library. + +------------------------------------------------------------------- Old: ---- deja-dup-28.0.tar.xz deja-dup-vala-0.22.patch New: ---- deja-dup-32.0.tar.xz deja-dup-help2man_stderr.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deja-dup.spec ++++++ --- /var/tmp/diff_new_pack.YMD1QD/_old 2014-09-28 19:55:26.000000000 +0200 +++ /var/tmp/diff_new_pack.YMD1QD/_new 2014-09-28 19:55:26.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package deja-dup # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -17,17 +17,18 @@ Name: deja-dup -Version: 28.0 +Version: 32.0 Release: 0 # FIXME: reenable "make check" in %%check, when lp#940110 is fixed Summary: Simple backup tool and frontend for duplicity License: GPL-3.0+ Group: Productivity/Archiving/Backup Url: https://launchpad.net/deja-dup -Source0: https://launchpad.net/deja-dup/28/%{version}/+download/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM deja-dup-vala-0.22.patch dimstar@opensuse.org -- Fix build with Vala 0.22, taken from launchpad. -Patch0: deja-dup-vala-0.22.patch +Source0: https://launchpad.net/deja-dup/32/%{version}/+download/%{name}-%{version}.tar.xz +# PATCH-FIX-OPENSUSE deja-dup-help2man_stderr.patch sfalken@opensuse.org -- fixes help2man failure in build +Patch0: deja-dup-help2man_stderr.patch # For make check to work, we need dbus-launch +BuildRequires: cmake BuildRequires: dbus-1-x11 BuildRequires: fdupes BuildRequires: intltool @@ -41,7 +42,7 @@ BuildRequires: pkgconfig(libnotify) >= 0.7 BuildRequires: pkgconfig(libpeas-1.0) BuildRequires: pkgconfig(libsecret-1) -Requires: duplicity >= 0.6.21 +Requires: duplicity >= 0.6.23 Recommends: %{name}-lang Recommends: python-boto Recommends: python-cloudfiles @@ -82,14 +83,19 @@ %lang_package %prep %setup -q -%patch0 -p0 +%patch0 -p1 %build -%configure --disable-static -make %{?_smp_mflags} +export CFLAGS="%{optflags} -Wl,-rpath=%{_libdir}/%{name}" +export CXXFLAGS="%{optflags} -Wl,-rpath=%{_libdir}/%{name}" +%cmake \ + -DENABLE_NAUTILUS=ON \ + -DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir} \ + -DCMAKE_INSTALL_LIBEXECDIR=%{_libexecdir} +%__make %{?_smp_mflags} %install -%makeinstall +%cmake_install find %{buildroot} -type f -name "*.la" -delete -print %suse_update_desktop_file deja-dup %suse_update_desktop_file deja-dup-monitor ++++++ deja-dup-28.0.tar.xz -> deja-dup-32.0.tar.xz ++++++ ++++ 338920 lines of diff (skipped) ++++++ deja-dup-help2man_stderr.patch ++++++ diff -rupN deja-dup-30.0.old/man/CMakeLists.txt deja-dup-30.0/man/CMakeLists.txt --- deja-dup-30.0.old/man/CMakeLists.txt 2013-09-30 19:06:59.000000000 -0700 +++ deja-dup-30.0/man/CMakeLists.txt 2014-08-09 11:10:28.379577743 -0700 @@ -21,8 +21,8 @@ string(REPLACE ".po" "" LINGUAS "${POFIL add_custom_command(OUTPUT C/deja-dup.1 C/deja-dup-preferences.1 COMMAND mkdir -p C - COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/help2man -N -i ${CMAKE_CURRENT_SOURCE_DIR}/include.main -L en_US.UTF-8 ${CMAKE_BINARY_DIR}/deja-dup/deja-dup -o C/deja-dup.1 - COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/help2man -N -i ${CMAKE_CURRENT_SOURCE_DIR}/include.pref -L en_US.UTF-8 ${CMAKE_BINARY_DIR}/deja-dup/preferences/deja-dup-preferences -o C/deja-dup-preferences.1 + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/help2man --no-discard-stderr -N -i ${CMAKE_CURRENT_SOURCE_DIR}/include.main -L en_US.UTF-8 ${CMAKE_BINARY_DIR}/deja-dup/deja-dup -o C/deja-dup.1 + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/help2man --no-discard-stderr -N -i ${CMAKE_CURRENT_SOURCE_DIR}/include.pref -L en_US.UTF-8 ${CMAKE_BINARY_DIR}/deja-dup/preferences/deja-dup-preferences -o C/deja-dup-preferences.1 DEPENDS deja-dup deja-dup-preferences) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/C/deja-dup.1 ${CMAKE_CURRENT_BINARY_DIR}/C/deja-dup-preferences.1 DESTINATION "${CMAKE_INSTALL_FULL_DATADIR}/man/man1") list(APPEND MAN_TARGETS C/deja-dup.1 C/deja-dup-preferences.1) @@ -31,8 +31,8 @@ foreach(LINGUA ${LINGUAS}) add_custom_command(OUTPUT ${LINGUA}/deja-dup.1 ${LINGUA}/deja-dup-preferences.1 COMMAND mkdir -p ${LINGUA} locales/${LINGUA}/LC_MESSAGES COMMAND ln -sf ${CMAKE_BINARY_DIR}/po/${LINGUA}.gmo locales/${LINGUA}/LC_MESSAGES/deja-dup.mo - COMMAND env DEJA_DUP_LOCALEDIR=${CMAKE_CURRENT_BINARY_DIR}/locales DEJA_DUP_LANGUAGE=${LINGUA} ${CMAKE_CURRENT_SOURCE_DIR}/help2man -N -i ${CMAKE_CURRENT_SOURCE_DIR}/include.main -L en_US.UTF-8 ${CMAKE_BINARY_DIR}/deja-dup/deja-dup -o ${LINGUA}/deja-dup.1 - COMMAND env DEJA_DUP_LOCALEDIR=${CMAKE_CURRENT_BINARY_DIR}/locales DEJA_DUP_LANGUAGE=${LINGUA} ${CMAKE_CURRENT_SOURCE_DIR}/help2man -N -i ${CMAKE_CURRENT_SOURCE_DIR}/include.main -L en_US.UTF-8 ${CMAKE_BINARY_DIR}/deja-dup/preferences/deja-dup-preferences -o ${LINGUA}/deja-dup-preferences.1 + COMMAND env DEJA_DUP_LOCALEDIR=${CMAKE_CURRENT_BINARY_DIR}/locales DEJA_DUP_LANGUAGE=${LINGUA} ${CMAKE_CURRENT_SOURCE_DIR}/help2man --no-discard-stderr -N -i ${CMAKE_CURRENT_SOURCE_DIR}/include.main -L en_US.UTF-8 ${CMAKE_BINARY_DIR}/deja-dup/deja-dup -o ${LINGUA}/deja-dup.1 + COMMAND env DEJA_DUP_LOCALEDIR=${CMAKE_CURRENT_BINARY_DIR}/locales DEJA_DUP_LANGUAGE=${LINGUA} ${CMAKE_CURRENT_SOURCE_DIR}/help2man --no-discard-stderr -N -i ${CMAKE_CURRENT_SOURCE_DIR}/include.main -L en_US.UTF-8 ${CMAKE_BINARY_DIR}/deja-dup/preferences/deja-dup-preferences -o ${LINGUA}/deja-dup-preferences.1 DEPENDS translations deja-dup deja-dup-preferences) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LINGUA}/deja-dup.1 ${CMAKE_CURRENT_BINARY_DIR}/${LINGUA}/deja-dup-preferences.1 DESTINATION "${CMAKE_INSTALL_FULL_DATADIR}/man/${LINGUA}/man1") -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de