From 7bb7219541b9e2c9d88448380ea3f7231a8a28986b43f64908427a5a115210e7 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Mon, 5 Sep 2011 17:23:55 +0000 Subject: [PATCH] Accepting request 81009 from home:vuntz:branches:GNOME:Apps Update to 19.91 OBS-URL: https://build.opensuse.org/request/show/81009 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/deja-dup?expand=0&rev=19 --- deja-dup-18.1.1.tar.bz2 | 3 -- deja-dup-19.91.tar.bz2 | 3 ++ deja-dup.changes | 83 +++++++++++++++++++++++++++++++++++++++++ deja-dup.spec | 62 +++++++++++++----------------- 4 files changed, 111 insertions(+), 40 deletions(-) delete mode 100644 deja-dup-18.1.1.tar.bz2 create mode 100644 deja-dup-19.91.tar.bz2 diff --git a/deja-dup-18.1.1.tar.bz2 b/deja-dup-18.1.1.tar.bz2 deleted file mode 100644 index f465836..0000000 --- a/deja-dup-18.1.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0b0f2201ca8f10fe528872510c7d0d2f614330db841aeac241fac1107eaf4582 -size 1183341 diff --git a/deja-dup-19.91.tar.bz2 b/deja-dup-19.91.tar.bz2 new file mode 100644 index 0000000..4d81415 --- /dev/null +++ b/deja-dup-19.91.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d3834d9304bbdb1702d8600f288deca4e3ab46994e574de13a18270e969f520 +size 1211048 diff --git a/deja-dup.changes b/deja-dup.changes index 045da97..692a03f 100644 --- a/deja-dup.changes +++ b/deja-dup.changes @@ -1,3 +1,86 @@ +------------------------------------------------------------------- +Mon Sep 5 12:34:05 UTC 2011 - vuntz@opensuse.org + +- Update to version 19.91: + + Polish: + - When newer versions of duplicity warn that a file has been + corrupted upon upload, Déjà Dup will intelligently retry the + backup + + Several bug fixes. + + Updated translations. +- Changes from version 19.90: + + Polish: + - Allow showing the progress dialog in GNOME Shell + + Updated translations. +- Changes from version 19.5: + + Polish: + - Lots of UI and label tweaks + - Don't show optical media in backup location dropdown + - Update backup location dropdown as external drives come and + go + - Allow drag and drop of folders into include/exclude lists + - Make it clear that the default home folder include is only + your user's home folder + - Don't keep notifying about delayed backups between setting up + your preferences and your first backup + + Several bug fixes. + + Updated translations. +- Changes from version 19.4: + + Polish: + - Drop encryption preference and either ask during first backup + or detect from existing backup + - More layout fixups to work better with latest GTK+ + - Where the Autostart-Delay key is supported, delay monitor + start by two minutes + + Several bug fixes. + + Updated translations. +- Changes from version 19.3: + + Polish: + - Fix some layout issues with latest GTK+ + - Don't show location preferences when restoring single files, + just on full restore + - Show launcher icon in Unity during automatic backup again + + Several bug fixes. + + Updated translations. +- Changes from version 19.2.2: + + Build fix. +- Changes from version 19.2.1: + + Build fix. +- Changes from version 19.2: + + Features: + - Turn on Ubuntu One support when using a newer duplicity + - Added monthly notification about backing up if user never + used deja-dup + + Polish: + - Better support for GNOME Shell and its notification system + - Run Déjà Dup itself under ionice and nice instead of just + duplicity + - Make volume chunk sizes larger, to reduce the number of files + created + + Several bug fixes. + + Updated translations. +- Changes from version 19.1: + + Features: + - Reworked interface to be a control center plugin + - Added overview page where last and next backup dates can be + seen + + Polish: + - Fleshed out and updated help documenation + - When restoring from a location that isn't your normal backup + location, your location isn't changed + - When encryption password is bad, ask for it again + - Only show nautilus context menu item if file is in backup + + Updated translations. +- Remove handling of the favor_gtk2 macro: deja-dup cannot be built + for GNOME 2 anymore. +- Add itstool BuildRequires: new dependency. +- Remove now unneeded pkgconfig(unique-3.0) BuildRequires. +- Add python-boto Recommends: this is an optional dependency for + Amazon Web Services integration. +- Correctly mark translated documentation with %lang() tags; this + should ideally be done by %find_lang, but we first need to check + if the new location is accepted as a standard one. + ------------------------------------------------------------------- Mon May 16 16:28:53 UTC 2011 - dimstar@opensuse.org diff --git a/deja-dup.spec b/deja-dup.spec index a6bfb84..5b3a331 100644 --- a/deja-dup.spec +++ b/deja-dup.spec @@ -18,8 +18,9 @@ Name: deja-dup -Version: 18.1.1 -Release: 3 +Version: 19.91 +Release: 1 +# FIXME: the %%{_datadir}/help/$locale/ files should go in lang subpackage and be found by %%find_lang; but before fixing everything, we need to check if this will be used by other packages # FIXME: check if python-cloudfiles is packaged, and if yes, uncomment Recommends License: GPLv3+ Summary: Simple backup tool and frontend for duplicity @@ -29,23 +30,17 @@ Source0: %{name}-%{version}.tar.bz2 BuildRequires: fdupes BuildRequires: gnome-doc-utils-devel BuildRequires: intltool +BuildRequires: itstool BuildRequires: perl-gettext BuildRequires: update-desktop-files -BuildRequires: vala +BuildRequires: vala >= 0.11.6 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) Requires: duplicity Recommends: %{name}-lang +Recommends: python-boto # Needed for Rackspace Cloud Files support, but not packaged :/ #Recommends: python-cloudfiles %glib2_gsettings_schema_requires @@ -88,12 +83,7 @@ This package contains a plugin to integrate Déjà Dup into Nautilus. %setup -q %build -%configure --disable-static \ -%if 0%{?favor_gtk2} - --without-gtk3 -%else - --with-gtk3 -%endif +%configure --disable-static %__make %{?_smp_mflags} %install @@ -103,12 +93,20 @@ find %{buildroot} -type f -name "*.la" -delete -print %suse_update_desktop_file deja-dup-monitor %suse_update_desktop_file deja-dup-preferences %find_lang %{name} %{?no_lang_C} +# Localized help +for help in %{buildroot}%{_datadir}/help/*/deja-dup/; do + LOCALE=`echo $help | sed "s:.*%{_datadir}/help/\([^/]*\)/deja-dup/:\1:g"` + echo "%%lang($LOCALE) %%dir %%{_datadir}/help/$LOCALE" >> %{name}.help-lang.tmp + echo "%%lang($LOCALE) %%doc /${help##%{buildroot}}" >> %{name}.help-lang.tmp +done +sort -u %{name}.help-lang.tmp > %{name}.help-lang +rm %{name}.help-lang.tmp # 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.tmp echo "%%lang($LOCALE) %%dir %%{_mandir}/$LOCALE/man1" >> %{name}.man-lang.tmp - echo "%%lang($LOCALE) %%doc ${man##%{buildroot}}*" >> %{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 @@ -136,43 +134,33 @@ rm -rf %{buildroot} %icon_theme_cache_postun %endif -%files -f %{name}.man-lang +%files -f %{name}.man-lang -f %{name}.help-lang %defattr(-,root,root) %doc AUTHORS COPYING NEWS -%dir %{_datadir}/gnome/ -%dir %{_datadir}/gnome/help/ -%dir %{_datadir}/gnome/help/%{name}/ -%doc %{_datadir}/gnome/help/%{name}/C/ +%dir %{_datadir}/help/ +%dir %{_datadir}/help/C/ +%doc %{_datadir}/help/C/%{name}/ %{_bindir}/deja-dup %{_bindir}/deja-dup-preferences %{_mandir}/man1/deja-dup.* %{_mandir}/man1/deja-dup-preferences.* %{_sysconfdir}/xdg/autostart/deja-dup-monitor.desktop -# We explicitly list the content of %%{_libdir}/deja-dup to make sure we put -# the files in the right subpackage -%dir %{_libdir}/deja-dup -%{_libdir}/deja-dup/deja-dup-monitor +# We explicitly list the content of %%{_libexecdir}/deja-dup to make sure we +# put the files in the right subpackage +%dir %{_libexecdir}/deja-dup +%{_libexecdir}/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-symbolic.svg %{_datadir}/icons/hicolor/scalable/devices/deja-dup-cloud.svg %{_datadir}/icons/hicolor/*/apps/deja-dup.png -# 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} -%{_libdir}/nautilus/extensions-2.0/libnautilus-deja-dup.so -%else -%{_libdir}/nautilus/extensions-3.0/libnautilus-deja-dup.so -%endif +%{_libdir}/nautilus/extensions-3.0/libdeja-dup.so %files lang -f %{name}.lang