From ce61188b85566f01c0ce53316447ba3c87a9c950c2c8bbcbed9a423b3969b108 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 28 Apr 2011 21:51:27 +0000 Subject: [PATCH 1/2] Accepting request 68702 from home:dimstar:branches:GNOME:Apps Updatet to 18.1.1 OBS-URL: https://build.opensuse.org/request/show/68702 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/deja-dup?expand=0&rev=14 --- deja-dup-16.1.1.tar.bz2 | 3 -- deja-dup-18.1.1.tar.bz2 | 3 ++ deja-dup-monitor_check_for_gtk.patch | 12 ------- deja-dup.changes | 22 ++++++++++++ deja-dup.spec | 53 ++++++++++++++++------------ 5 files changed, 55 insertions(+), 38 deletions(-) delete mode 100644 deja-dup-16.1.1.tar.bz2 create mode 100644 deja-dup-18.1.1.tar.bz2 delete mode 100644 deja-dup-monitor_check_for_gtk.patch diff --git a/deja-dup-16.1.1.tar.bz2 b/deja-dup-16.1.1.tar.bz2 deleted file mode 100644 index cb5208f..0000000 --- a/deja-dup-16.1.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:92fc7d39f20d2a5049e3a868902c85b6875a74b19a19f4f3e64c98db834cea72 -size 934708 diff --git a/deja-dup-18.1.1.tar.bz2 b/deja-dup-18.1.1.tar.bz2 new file mode 100644 index 0000000..f465836 --- /dev/null +++ b/deja-dup-18.1.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0b0f2201ca8f10fe528872510c7d0d2f614330db841aeac241fac1107eaf4582 +size 1183341 diff --git a/deja-dup-monitor_check_for_gtk.patch b/deja-dup-monitor_check_for_gtk.patch deleted file mode 100644 index 0df973b..0000000 --- a/deja-dup-monitor_check_for_gtk.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: configure.ac -=================================================================== ---- configure.ac.orig -+++ configure.ac -@@ -119,6 +119,7 @@ AC_SUBST(PREF_CFLAGS) - AC_SUBST(PREF_LIBS) - - PKG_CHECK_MODULES(COMMON, -+ $GTK_MODULE >= $GTK_REQ_VER - gio-2.0 >= $GIO_REQ_VER - gio-unix-2.0 >= $GIO_REQ_VER - gconf-2.0 diff --git a/deja-dup.changes b/deja-dup.changes index b9b6fc8..d0a58da 100644 --- a/deja-dup.changes +++ b/deja-dup.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Wed Apr 27 09:48:23 CEST 2011 - dimstar@opensuse.org + +- Update to version 18.1.1: + + Actually work with NetworkManager 0.9 + + Updated translations. +- Changes from version 18.1: + + Work with NetworkManager 0.9 +- Changes from version 18.0: + + If using an older duplicity and it gives a certain bogus "time + not moving forward" error, handle it instead of passing the + error along + + Create backup location folder if it doesn't exist + + Don't show duplicate external hard drives. +- For a complete list of changes between 16.1.1 and 18.0 see NEWS. +- BuildRequire intltool. +- Drop deja-dup-monitor_check_for_gtk.patch: fixed upstream and + related gnome-common BuildRequires and gnome-autogen.sh call. +- Switch between gtk2/gtk3 based on favor_gtk2 macro. +- Add pkgconfig(gtk+-3.0) and pkgconfig(unique-3.0) BuildRequires + when building gtk3 variant. + ------------------------------------------------------------------- Sat Feb 12 17:09:17 CET 2011 - vuntz@opensuse.org diff --git a/deja-dup.spec b/deja-dup.spec index 7777173..76816c8 100644 --- a/deja-dup.spec +++ b/deja-dup.spec @@ -1,7 +1,7 @@ # -# spec file for package deja-dup (Version 16.1.1) +# spec file for package deja-dup # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -15,35 +15,35 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: deja-dup -Version: 16.1.1 -Release: 2 +Version: 18.1.1 +Release: 1 License: GPLv3+ Summary: Simple backup tool and frontend for duplicity Url: https://launchpad.net/deja-dup Group: Productivity/Archiving/Backup Source0: %{name}-%{version}.tar.bz2 -# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/Packaging/Patches -Patch0: deja-dup-monitor_check_for_gtk.patch BuildRequires: fdupes -# Required for PATCH0 -BuildRequires: gnome-common BuildRequires: gnome-doc-utils-devel +BuildRequires: intltool +BuildRequires: perl-gettext BuildRequires: pkgconfig(gconf-2.0) BuildRequires: pkgconfig(gnome-keyring-1) +%if 0%{favor_gtk2} BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(unique-1.0) +%else +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(unique-3.0) +%endif BuildRequires: pkgconfig(libnautilus-extension) # This would be an additional Option for deja-dup #BuildRequires: pkgconfig(appindicator-0.1) BuildRequires: pkgconfig(libnotify) -BuildRequires: pkgconfig(unique-1.0) BuildRequires: update-desktop-files BuildRequires: vala Requires: duplicity Recommends: %{name}-lang -%gconf_schemas_prereq %description Déjà Dup is a simple backup tool. It hides the complexity of doing @@ -81,13 +81,15 @@ This package contains a plugin to integrate Déjà Dup into Nautilus. %lang_package %prep %setup -q -%patch0 %build -NOCONFIGURE=1 gnome-autogen.sh %configure --disable-static \ --disable-schemas-install \ +%if 0%{favor_gtk2} --without-gtk3 +%else + --with-gtk3 +%endif %__make %{?_smp_mflags} %install @@ -108,30 +110,25 @@ done %fdupes -s %{buildroot}%{_mandir} # create hardlinks for the rest %fdupes %{buildroot} -%find_gconf_schemas %clean rm -rf %{buildroot} -%pre -f %{name}.schemas_pre - -%posttrans -f %{name}.schemas_posttrans - -%preun -f %{name}.schemas_preun - %if 0%{?suse_version} > 1130 + %post %desktop_database_post %icon_theme_cache_post %endif %if 0%{?suse_version} > 1130 + %postun %desktop_database_postun %icon_theme_cache_postun %endif -%files -f %{name}.schemas_list -f %{name}.man-lang +%files -f %{name}.man-lang %defattr(-,root,root) %doc AUTHORS COPYING NEWS %dir %{_datadir}/gnome/ @@ -149,15 +146,25 @@ rm -rf %{buildroot} %{_libdir}/deja-dup/deja-dup-monitor %{_datadir}/applications/deja-dup.desktop %{_datadir}/applications/deja-dup-preferences.desktop +%{_datadir}/%{name} +%{_datadir}/GConf/gsettings/deja-dup.convert +%{_datadir}/glib-2.0/schemas/org.gnome.DejaDup.gschema.xml %{_datadir}/icons/hicolor/scalable/actions/deja-dup-backup.svg %{_datadir}/icons/hicolor/scalable/actions/deja-dup-restore.svg -%{_datadir}/icons/hicolor/scalable/apps/deja-dup.svg %{_datadir}/icons/hicolor/scalable/apps/deja-dup-symbolic.svg +%{_datadir}/icons/hicolor/scalable/devices/deja-dup-cloud.svg +%{_datadir}/icons/hicolor/*/apps/deja-dup.png +%{_datadir}/icons/ubuntu-mono-* %files -n nautilus-deja-dup %defattr(-,root,root) +%if 0%{favor_gtk2} %{_libdir}/nautilus/extensions-2.0/libnautilus-deja-dup.so +%else +%{_libdir}/nautilus/extensions-3.0/libnautilus-deja-dup.so +%endif %files lang -f %{name}.lang %changelog + From 5a99948cb020e7083186f3c32da3f89840c1136bf9e80f24662f0f0050fd8cbe Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 28 Apr 2011 22:57:33 +0000 Subject: [PATCH 2/2] Accepting request 68747 from home:vuntz:branches:GNOME:Apps tweak OBS-URL: https://build.opensuse.org/request/show/68747 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/deja-dup?expand=0&rev=15 --- deja-dup.changes | 86 ++++++++++++++++++++++++++++++++++++++++++++---- deja-dup.spec | 30 +++++++++-------- 2 files changed, 97 insertions(+), 19 deletions(-) diff --git a/deja-dup.changes b/deja-dup.changes index d0a58da..2d7108a 100644 --- a/deja-dup.changes +++ b/deja-dup.changes @@ -12,13 +12,87 @@ Wed Apr 27 09:48:23 CEST 2011 - dimstar@opensuse.org error along + Create backup location folder if it doesn't exist + Don't show duplicate external hard drives. +- Changes from version 17.92: + - Re-enabled support for resuming a backup, if using the + unreleased duplicity 0.6.13 + - New icon + + Updated translations. +- Changes from version 17.91: + + Rename Quit to Close + + Bug Fixes: + - Fix a couple issues with Unity integration (like not showing + in launcher) + - Fix some broken label mnemonics in the preferences + + Updated translations. +- Changes from version 17.90: + + When entering an encryption password for the first time, it now + needs to be confirmed to avoid typo mistakes + + First pass at optional Unity integration (instead of a status + icon) + + Bug Fixes: + - Fixed bug with remote locations that made it impossible to + set a remote folder + - Fix a couple rare crashers + + Updated translations. +- Changes from version 17.6: + + Exclude Adobe flash cache directory by default + + Add documentation for how to get your data back even if Déjà + Dup isn't working + + Bug Fixes: + - Don't show error if both Déjà Dup and nautilus are trying to + mount a volume at the same time + - Allow removing multiple folders from the preferences at the + same time + - Handle more odd symlink-in-include-path situations + - Fix odd behavior (possibly a crash) when cancelling a backup + or restore +- Changes from version 17.5: + + Add support for the Rackspace Cloud Files service + + Use hostname in default Amazon S3 folder name + + Add Downloads folder to default exclude list + + Bug Fixes: + - Fix crash when changing backup location on first startup + - When browsing for a local folder, start the dialog in the + current folder setting + + Updated translations. +- Changes from version 17.4: + + Reorganize the backup location preferences to be more intuitive + + Updated translations. +- Changes from version 17.3: + + Bug fixes: + - Fix crash when changing backup location + - Fix date formats when restoring to be more consistent + + Updated translations. +- Changes from version 17.2: + + Add a "Restore Missing Files" interface, accessed via nautilus + + Support GNOME Shell persistent notifications + + Only calculate progress bar if a fresh backup is being made + + Bug Fixes: + - If Duplicity looks like it's hitting a common ad-metadata + bug, clear cache and try again +- Changes from version 17.1: + + Bug Fixes: + - If backup destination does not report free size, just + continue anyway + - Fix bug preventing sudo and encryption getting along + - Don't ask for root password when restoring into the user's + home folder +- Changes from version 17.0: + + Use GSettings instead of gconf + + Updated translations. - For a complete list of changes between 16.1.1 and 18.0 see NEWS. -- BuildRequire intltool. -- Drop deja-dup-monitor_check_for_gtk.patch: fixed upstream and - related gnome-common BuildRequires and gnome-autogen.sh call. -- Switch between gtk2/gtk3 based on favor_gtk2 macro. -- Add pkgconfig(gtk+-3.0) and pkgconfig(unique-3.0) BuildRequires - when building gtk3 variant. +- Drop deja-dup-monitor_check_for_gtk.patch: fixed upstream. Also + remove related gnome-common BuildRequires and gnome-autogen.sh + call. +- Add intltool and perl-gettext BuildRequires. +- Drop pkgconfig(gconf-2.0) BuildRequires. +- Switch between gtk2/gtk3 based on favor_gtk2 macro: + + Pass --without-gtk3/--with-gtk3 to configure. + + Use appropriate pkgconfig() BuildRequires: gtk+-2.0 and + unique-1.0, or gtk+-3.0 and unique-3.0. +- Replace GConf2 schemas handling with GSettings schemas handling, + with %glib2_gsettings_schema_* macros, and remove + --disable-schemas-install from configure call. ------------------------------------------------------------------- Sat Feb 12 17:09:17 CET 2011 - vuntz@opensuse.org diff --git a/deja-dup.spec b/deja-dup.spec index 76816c8..3534433 100644 --- a/deja-dup.spec +++ b/deja-dup.spec @@ -18,6 +18,7 @@ Name: deja-dup Version: 18.1.1 Release: 1 +# FIXME: check if python-cloudfiles is packaged, and if yes, uncomment Recommends License: GPLv3+ Summary: Simple backup tool and frontend for duplicity Url: https://launchpad.net/deja-dup @@ -27,9 +28,10 @@ BuildRequires: fdupes BuildRequires: gnome-doc-utils-devel BuildRequires: intltool BuildRequires: perl-gettext -BuildRequires: pkgconfig(gconf-2.0) +BuildRequires: update-desktop-files +BuildRequires: vala BuildRequires: pkgconfig(gnome-keyring-1) -%if 0%{favor_gtk2} +%if 0%{?favor_gtk2} BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(unique-1.0) %else @@ -40,10 +42,10 @@ BuildRequires: pkgconfig(libnautilus-extension) # This would be an additional Option for deja-dup #BuildRequires: pkgconfig(appindicator-0.1) BuildRequires: pkgconfig(libnotify) -BuildRequires: update-desktop-files -BuildRequires: vala Requires: duplicity Recommends: %{name}-lang +# Needed for Rackspace Cloud Files support, but not packaged :/ +#Recommends: python-cloudfiles %description Déjà Dup is a simple backup tool. It hides the complexity of doing @@ -84,8 +86,7 @@ This package contains a plugin to integrate Déjà Dup into Nautilus. %build %configure --disable-static \ - --disable-schemas-install \ -%if 0%{favor_gtk2} +%if 0%{?favor_gtk2} --without-gtk3 %else --with-gtk3 @@ -102,10 +103,12 @@ find %{buildroot} -type f -name "*.la" -delete -print # Localized man pages for man in %{buildroot}%{_mandir}/*/man1/*; do LOCALE=`echo $man | sed "s:.*%{_mandir}/\([^/]*\)/man1/.*:\1:g"` - echo "%%lang($LOCALE) %%dir %%{_mandir}/$LOCALE" >> %{name}.man-lang - echo "%%lang($LOCALE) %%dir %%{_mandir}/$LOCALE/man1" >> %{name}.man-lang - echo "%%lang($LOCALE) %%doc ${man##%{buildroot}}*" >> %{name}.man-lang + echo "%%lang($LOCALE) %%dir %%{_mandir}/$LOCALE" >> %{name}.man-lang.tmp + echo "%%lang($LOCALE) %%dir %%{_mandir}/$LOCALE/man1" >> %{name}.man-lang.tmp + echo "%%lang($LOCALE) %%doc ${man##%{buildroot}}*" >> %{name}.man-lang.tmp done +sort -u %{name}.man-lang.tmp > %{name}.man-lang +rm %{name}.man-lang.tmp # create symlinks for man pages %fdupes -s %{buildroot}%{_mandir} # create hardlinks for the rest @@ -146,7 +149,7 @@ rm -rf %{buildroot} %{_libdir}/deja-dup/deja-dup-monitor %{_datadir}/applications/deja-dup.desktop %{_datadir}/applications/deja-dup-preferences.desktop -%{_datadir}/%{name} +%{_datadir}/%{name}/ %{_datadir}/GConf/gsettings/deja-dup.convert %{_datadir}/glib-2.0/schemas/org.gnome.DejaDup.gschema.xml %{_datadir}/icons/hicolor/scalable/actions/deja-dup-backup.svg @@ -154,11 +157,13 @@ rm -rf %{buildroot} %{_datadir}/icons/hicolor/scalable/apps/deja-dup-symbolic.svg %{_datadir}/icons/hicolor/scalable/devices/deja-dup-cloud.svg %{_datadir}/icons/hicolor/*/apps/deja-dup.png -%{_datadir}/icons/ubuntu-mono-* +# Own the full directories as we don't even have those themes packaged +%{_datadir}/icons/ubuntu-mono-dark/ +%{_datadir}/icons/ubuntu-mono-light/ %files -n nautilus-deja-dup %defattr(-,root,root) -%if 0%{favor_gtk2} +%if 0%{?favor_gtk2} %{_libdir}/nautilus/extensions-2.0/libnautilus-deja-dup.so %else %{_libdir}/nautilus/extensions-3.0/libnautilus-deja-dup.so @@ -167,4 +172,3 @@ rm -rf %{buildroot} %files lang -f %{name}.lang %changelog -