From e066463afc06ab7faf34eefc43c28af61dae2c99 Mon Sep 17 00:00:00 2001
From: Rahul Sundaram <sundaram@fedoraproject.org>
Date: May 08 2010 11:26:33 +0000
Subject: -

    http://bazaar.launchpad.net/~deja-dup-team/deja-dup/trunk/revision/646#
    NEWS
- Reorganize help documentation to use new mallard format
- Change terminology for 'backup' verb to 'back up'
- Many new and updated translations
Sat May 01 2010 Rahul Sundaram <sundaram@fedoraproject.org> - 14.1-1
- https://launchpad.net/deja-dup/+announcement/5730
- Fix critical bugs preventing backup to external disks and restore single
    dir

---

diff --git a/.cvsignore b/.cvsignore
index 15f0c0e..0ce7d12 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-deja-dup-13.92.tar.bz2
+deja-dup-15.1.tar.bz2
diff --git a/deja-dup.spec b/deja-dup.spec
index 92b69f6..26fb5ae 100644
--- a/deja-dup.spec
+++ b/deja-dup.spec
@@ -1,17 +1,21 @@
 Name:           deja-dup
-Version:        13.92
+Version:        15.1
 Release:        1%{?dist}
 Summary:        Simple backup tool and frontend for duplicity
 
 Group:          Applications/Archiving
 License:        GPLv3+
 URL:            https://launchpad.net/deja-dup
-Source0:        http://launchpad.net/%{name}/14/%{version}/+download/%{name}-%{version}.tar.bz2
+Source0:        http://launchpad.net/%{name}/16/%{version}/+download/%{name}-%{version}.tar.bz2
 BuildRequires:  gettext desktop-file-utils intltool scrollkeeper
 BuildRequires:  gnome-doc-utils pango-devel cairo-devel vala-devel
-BuildRequires:  libtool GConf2-devel glib2-devel libnotify-devel 
+BuildRequires:  libtool GConf2 GConf2-devel glib2-devel libnotify-devel 
 BuildRequires:  po4a unique-devel nautilus-devel gnome-keyring-devel
-Requires:       duplicity yelp
+Requires:       duplicity yelp 
+Requires(pre):  GConf2
+Requires(post): GConf2
+Requires(preun):GConf2
+
 %description
 Déjà Dup is a simple backup tool. It hides the complexity of doing backups the 
 'right way' (encrypted, off-site, and regular) and uses duplicity as the 
@@ -27,24 +31,28 @@ Features:
 %prep
 %setup -q
 
-
 %build
-%configure --disable-static
+%configure --disable-static --disable-schemas-install
 make %{?_smp_mflags}
 
-
 %install
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=%{buildroot}
+unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 rm -f %{buildroot}/%{_libdir}/nautilus/extensions-2.0/*.la
 rm -f %{buildroot}/%{_datadir}/icons/Humanity/
 
 %find_lang %{name} --with-man --with-gnome 
 
-%clean
-rm -rf %{buildroot}
+%pre
+%gconf_schema_prepare deja-dup
 
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+%gconf_schema_upgrade deja-dup
+
+%preun
+%gconf_schema_remove deja-dup
 
 %postun
 if [ $1 -eq 0 ] ; then
@@ -62,21 +70,42 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %doc COPYING NEWS 
 %{_bindir}/deja-*
 %{_mandir}/man1/deja-dup.1.gz
-%{_mandir}/man1/deja-dup-monitor.1.gz
 %{_mandir}/man1/deja-dup-preferences.1.gz
-%{_mandir}/*/man1/deja-dup-monitor.1.gz
 %{_mandir}/*/man1/deja-dup-preferences.1.gz
 %{_sysconfdir}/gconf/schemas/deja-dup.schemas
 %{_sysconfdir}/xdg/autostart/deja-dup-monitor.desktop
 %{_libdir}/nautilus/extensions-2.0/libnautilus-deja-dup.so
+%{_libdir}/deja-dup/deja-dup-monitor
 %{_datadir}/applications/deja-dup.desktop
 %{_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
 
-
 %changelog
+* Sat May 08 2010 Rahul Sundaram <sundaram@fedoraproject.org> - 15.1-1
+- http://bazaar.launchpad.net/~deja-dup-team/deja-dup/trunk/revision/646#NEWS
+- Reorganize help documentation to use new mallard format
+- Change terminology for 'backup' verb to 'back up'
+- Many new and updated translations
+ 
+* Sat May 01 2010 Rahul Sundaram <sundaram@fedoraproject.org> - 14.1-1
+- https://launchpad.net/deja-dup/+announcement/5730
+- Fix critical bugs preventing backup to external disks and restore single dir
+
+* Sun Apr 18 2010 Rahul Sundaram <sundaram@fedoraproject.org> - 14.0.3-1
+- https://launchpad.net/deja-dup/+announcement/5630
+- fix restoring to a non-empty directory
+
+* Mon Apr 12 2010 Rahul Sundaram <sundaram@fedoraproject.org> - 14.0.2-1
+- https://launchpad.net/deja-dup/+announcement/5544
+- drop the clean section
+
+* Thu Apr 01 2010 Rahul Sundaram <sundaram@fedoraproject.org> - 14.0-1
+- new upstream release
+- http://bazaar.launchpad.net/~deja-dup-team/deja-dup/14/annotate/head:/NEWS
+- Gconf schema installation. Fixes rhbz #577004
+
 * Mon Mar 20 2010 Rahul Sundaram <sundaram@fedoraproject.org> - 13.92-1
 - new upstream release
 - https://launchpad.net/deja-dup/+announcement/5313
diff --git a/sources b/sources
index 00e3b59..ed3ffbc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9408b680fc645791b5656e7943c9afa5  deja-dup-13.92.tar.bz2
+12a2902ba6e47a6d757f243b05b70f60  deja-dup-15.1.tar.bz2