Accepting request 107032 from GNOME:Apps

Use yelp-tools BuildRequires (forwarded request 107011 from vuntz)

OBS-URL: https://build.opensuse.org/request/show/107032
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/deja-dup?expand=0&rev=23

deja-dup-21.4.tar.xz

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

deja-dup-21.90.tar.xz

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

deja-dup-vala-0.16.patch

@@ -1,19 +0,0 @@
-Index: deja-dup-21.4/deja-dup/AssistantOperation.vala
-===================================================================
---- deja-dup-21.4.orig/deja-dup/AssistantOperation.vala
-+++ deja-dup-21.4/deja-dup/AssistantOperation.vala
-@@ -193,12 +193,12 @@ public abstract class AssistantOperation
-       Gtk.TextIter start, line100;
-       buffer.get_start_iter(out start);
-       buffer.get_iter_at_line(out line100, buffer.get_line_count() - 100);
--      buffer.delete(start, line100);
-+      buffer.delete(ref start, ref line100);
-     }
-     
-     Gtk.TextIter iter;
-     buffer.get_end_iter(out iter);
--    buffer.insert_text(iter, log_line, (int)log_line.length);
-+    buffer.insert_text(ref iter, log_line, (int)log_line.length);
-     if (adjustment_at_end)
-       adjust.value = adjust.upper;
-   }

deja-dup.changes

@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Sun Feb 26 14:08:02 UTC 2012 - vuntz@opensuse.org
+
+- Change itstool BuildRequires to yelp-tools: this is really what
+  is needed for build.
+
+-------------------------------------------------------------------
+Fri Feb 24 07:34:43 UTC 2012 - vuntz@opensuse.org
+
+- Update to version 21.90:
+  + Polish:
+    - Won't try to backup if online but target server is not
+      available
+  + Bug Fixes:
+    - Work around bug in GTK+ that caused text to be white-on-white
+  + Packaging:
+    - Support building with valac-0.16 (in addition to valac-0.14)
+  + Updated translations.
+- Drop deja-dup-vala-0.16.patch: fixed upstream.
+- Disable 'make check' in %check, as it's failing for a weird
+  reason when run on OBS, see lp#940110.
+
 -------------------------------------------------------------------
 Mon Jan 16 13:34:57 UTC 2012 - vuntz@opensuse.org
 

deja-dup.spec

@@ -17,8 +17,9 @@
 
 
 Name:           deja-dup
-Version:        21.4
+Version:        21.90
 Release:        0
+# FIXME: reenable "make check" in %%check, when lp#940110 is fixed
 # FIXME: the %%{_datadir}/help/$locale/ files be found by %%find_lang
 # FIXME: check if python-cloudfiles is packaged, and if yes, uncomment Recommends
 Summary:        Simple backup tool and frontend for duplicity
@@ -26,19 +27,17 @@ License:        GPL-3.0+
 Group:          Productivity/Archiving/Backup
 Url:            https://launchpad.net/deja-dup
 Source0:        %{name}-%{version}.tar.xz
-# PATCH-FIX-UPSTREAM deja-dup-vala-0.16.patch lp#91717 vuntz@opensuse.org -- Fix build with vala 0.15/0.16
-Patch0:         deja-dup-vala-0.16.patch
 # For make check to work, we need dbus-launch
 BuildRequires:  dbus-1-x11
 BuildRequires:  fdupes
 BuildRequires:  gnome-doc-utils-devel
 BuildRequires:  intltool
-BuildRequires:  itstool
 BuildRequires:  perl-gettext
 BuildRequires:  update-desktop-files
 BuildRequires:  vala >= 0.14.0
 # Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467
 BuildRequires:  xz
+BuildRequires:  yelp-tools
 BuildRequires:  pkgconfig(gnome-keyring-1)
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(libnautilus-extension)
@@ -85,7 +84,6 @@ This package contains a plugin to integrate Déjà Dup into Nautilus.
 %lang_package
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure --disable-static
@@ -121,7 +119,8 @@ rm %{name}.man-lang.tmp
 %fdupes %{buildroot}
 
 %check
-make check
+# FIXME: disabled because of lp#940110
+#make check
 
 %if 0%{?suse_version} > 1130