From 22843adc6fb3addfa095939e7e5d18af1aefc3514f34dd167fd210567c38e561 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 25 Feb 2012 12:04:07 +0000 Subject: [PATCH 1/2] Accepting request 106816 from home:vuntz:branches:GNOME:Apps Update to 21.90 OBS-URL: https://build.opensuse.org/request/show/106816 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/deja-dup?expand=0&rev=37 --- deja-dup-21.4.tar.xz | 3 --- deja-dup-21.90.tar.xz | 3 +++ deja-dup-vala-0.16.patch | 19 ------------------- deja-dup.changes | 16 ++++++++++++++++ deja-dup.spec | 9 ++++----- 5 files changed, 23 insertions(+), 27 deletions(-) delete mode 100644 deja-dup-21.4.tar.xz create mode 100644 deja-dup-21.90.tar.xz delete mode 100644 deja-dup-vala-0.16.patch diff --git a/deja-dup-21.4.tar.xz b/deja-dup-21.4.tar.xz deleted file mode 100644 index 43fe638..0000000 --- a/deja-dup-21.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9b545afc0008a5cdec07f306df774cbae06afb92f37f27e120d33d6f1097ffc5 -size 769992 diff --git a/deja-dup-21.90.tar.xz b/deja-dup-21.90.tar.xz new file mode 100644 index 0000000..012c0b8 --- /dev/null +++ b/deja-dup-21.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c5e9cff94a0ee9bc16130f987f8d7cf7c02efa5d824a2ac43005ad3f4d586e77 +size 758972 diff --git a/deja-dup-vala-0.16.patch b/deja-dup-vala-0.16.patch deleted file mode 100644 index afd1ecf..0000000 --- a/deja-dup-vala-0.16.patch +++ /dev/null @@ -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; - } diff --git a/deja-dup.changes b/deja-dup.changes index 02e1687..3d518a2 100644 --- a/deja-dup.changes +++ b/deja-dup.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +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 diff --git a/deja-dup.spec b/deja-dup.spec index 5d0e132..378df4e 100644 --- a/deja-dup.spec +++ b/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,8 +27,6 @@ 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 @@ -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 From c4027d30843fdac9045b6a825130073d40094c3495f4cf2cdcdd94c27039cf98 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sun, 26 Feb 2012 15:35:07 +0000 Subject: [PATCH 2/2] Accepting request 107011 from home:vuntz:branches:GNOME:Apps Use yelp-tools BuildRequires OBS-URL: https://build.opensuse.org/request/show/107011 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/deja-dup?expand=0&rev=38 --- deja-dup.changes | 6 ++++++ deja-dup.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/deja-dup.changes b/deja-dup.changes index 3d518a2..22af404 100644 --- a/deja-dup.changes +++ b/deja-dup.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/deja-dup.spec b/deja-dup.spec index 378df4e..b9bfd04 100644 --- a/deja-dup.spec +++ b/deja-dup.spec @@ -32,12 +32,12 @@ 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)