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 +