Accepting request 244083 from home:sfalken:branches:GNOME:Apps

- 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

OBS-URL: https://build.opensuse.org/request/show/244083
OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/deja-dup?expand=0&rev=56

deja-dup.spec

@@ -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,7 +17,7 @@
 
 
 Name:           deja-dup
-Version:        28.0
+Version:        30.0
 Release:        0
 # FIXME: reenable "make check" in %%check, when lp#940110 is fixed
 Summary:        Simple backup tool and frontend for duplicity
@@ -25,9 +25,10 @@ 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
+# PATCH-FIX-OPENSUSE 0001-help2man_stderr.patch sfalken@opensuse.org -- fixes help2man failure in build
+Patch0:         0001-help2man_stderr.patch
 # For make check to work, we need dbus-launch
+BuildRequires:  cmake
 BuildRequires:  dbus-1-x11
 BuildRequires:  fdupes
 BuildRequires:  intltool
@@ -82,14 +83,17 @@ This package contains a plugin to integrate Déjà Dup into Nautilus.
 %lang_package
 %prep
 %setup -q
-%patch0 -p0
+%patch0 -p1
 
 %build
-%configure --disable-static
-make %{?_smp_mflags}
+%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