pool/deja-dup
SHA256
9
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
- 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
This commit is contained in:
Dominique Leuenberger
2014-08-13 18:32:10 +00:00
committed by Git OBS Bridge
parent 5ed191ac95
commit 143d02426b
6 changed files with 79 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
0001-help2man_stderr.patch Normal file
View File

@@ -0,0 +1,25 @@
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")

3
deja-dup-28.0.tar.xz
View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d29b8979add921127edacd35da434b22903a78bcf8431d884f576b11bbad5cbe
size 825552

3
deja-dup-30.0.tar.xz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4fd00af23904e5fa7165954a5dabea01626c72d20f21a5245fb6dad212b9cb4a
size 684948

25
deja-dup-vala-0.22.patch
View File

@@ -1,25 +0,0 @@
=== modified file 'CMakeLists.txt'
Index: deja-dup/widgets/WidgetUtils.vala
===================================================================
--- deja-dup/widgets/WidgetUtils.vala.orig
+++ deja-dup/widgets/WidgetUtils.vala
@@ -19,6 +19,10 @@
using GLib;
+// vala 0.22.1 changed the prototype for Notify.get_server_caps.
+// Rather than require that specific version, use 0.22.1's definition directly.
+extern GLib.List notify_get_server_caps();
+
namespace DejaDup {
public void show_uri(Gtk.Window parent, string link)
@@ -60,7 +64,7 @@ public ShellEnv get_shell()
// Use Legacy unless we detect a different shell.
shell = ShellEnv.LEGACY;
// Next check for Shell by notification capabilities
- unowned List<string> caps = Notify.get_server_caps();
+ List<string> caps = notify_get_server_caps();
bool persistence = false, actions = false;
foreach (string cap in caps) {
if (cap == "persistence")

39
deja-dup.changes
View File

@@ -1,3 +1,42 @@
-------------------------------------------------------------------
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 0001-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
-------------------------------------------------------------------
Tue Dec 24 21:06:08 UTC 2013 - dimstar@opensuse.org

20
deja-dup.spec
View File

@@ -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