[deja-dup] bump to 17.1, fix build against new libnotify

[Adam Williamson]

commit aff843904a957eb9f45c0e14631235bbff34bf8c
Author: Adam Williamson <adamwill at shaw.ca>
Date:   Fri Nov 12 13:26:14 2010 -0800

    bump to 17.1, fix build against new libnotify

 .gitignore                 |    1 +
 deja-dup-17.1-notify.patch |   11 +++++++++++
 deja-dup.spec              |   28 +++++++++++++++++-----------
 sources                    |    2 +-
 4 files changed, 30 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 24878bc..e6f8500 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 deja-dup-15.3.tar.bz2
+/deja-dup-17.1.tar.bz2
diff --git a/deja-dup-17.1-notify.patch b/deja-dup-17.1-notify.patch
new file mode 100644
index 0000000..e587c34
--- /dev/null
+++ b/deja-dup-17.1-notify.patch
@@ -0,0 +1,11 @@
+--- deja-dup-17.1/monitor/monitor.c	2010-10-02 16:09:21.000000000 -0700
++++ deja-dup-17.1/monitor/monitor.c.new	2010-11-12 12:25:42.723895044 -0800
+@@ -357,7 +357,7 @@
+ 	if (monitor_note == NULL) {
+ 		NotifyNotification* _tmp0_;
+ 		notify_init (g_get_application_name ());
+-		monitor_note = (_tmp0_ = notify_notification_new (header, reason, "deja-dup-backup", NULL), _g_object_unref0 (monitor_note), _tmp0_);
++		monitor_note = (_tmp0_ = notify_notification_new (header, reason, "deja-dup-backup"), _g_object_unref0 (monitor_note), _tmp0_);
+ 		g_signal_connect (monitor_note, "closed", (GCallback) __lambda0__notify_notification_closed, NULL);
+ 	} else {
+ 		notify_notification_update (monitor_note, header, reason, "deja-dup-backup");
diff --git a/deja-dup.spec b/deja-dup.spec
index 5576510..0922c2f 100644
--- a/deja-dup.spec
+++ b/deja-dup.spec
@@ -1,12 +1,16 @@
 Name:           deja-dup
-Version:        15.3
-Release:        2%{?dist}
+Version:        17.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}/16/%{version}/+download/%{name}-%{version}.tar.bz2
+# upstream wants to stick with the old libnotify for now so this patch
+# is not upstreamed. changes .c rather than .vala as we don't re-generate
+# the .c files as part of build - adamw 2010/11
+Patch0:		deja-dup-17.1-notify.patch
 BuildRequires:  gettext desktop-file-utils intltool scrollkeeper
 BuildRequires:  gnome-doc-utils pango-devel cairo-devel vala-devel
 BuildRequires:  libtool GConf2 GConf2-devel glib2-devel libnotify-devel 
@@ -30,6 +34,7 @@ Features:
 
 %prep
 %setup -q
+%patch0 -p1 -b .notify
 
 %build
 %configure --disable-static --disable-schemas-install
@@ -44,25 +49,19 @@ rm -f %{buildroot}/%{_datadir}/icons/Humanity/
 
 %find_lang %{name} --with-man --with-gnome 
 
-%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
     touch --no-create %{_datadir}/icons/hicolor &>/dev/null
     gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+    glib-compile-schemas %{_datadir}/glib-2.0/schemas
 fi
 
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-
+glib-compile-schemas %{_datadir}/glib-2.0/schemas
 
 
 %files -f %{name}.lang 
@@ -72,8 +71,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_mandir}/man1/deja-dup.1.gz
 %{_mandir}/man1/deja-dup-preferences.1.gz
 %{_mandir}/*/man1/deja-dup-preferences.1.gz
-%{_sysconfdir}/gconf/schemas/deja-dup.schemas
+%{_datadir}/GConf/gsettings/deja-dup.convert
+%{_datadir}/glib-2.0/schemas/org.gnome.DejaDup.gschema.xml
 %{_sysconfdir}/xdg/autostart/deja-dup-monitor.desktop
+%{_datadir}/applications/deja-dup-preferences.desktop
 %{_libdir}/nautilus/extensions-2.0/libnautilus-deja-dup.so
 %{_libdir}/deja-dup/deja-dup-monitor
 %{_datadir}/applications/deja-dup.desktop
@@ -83,6 +84,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/icons/hicolor/scalable/apps/deja-dup-symbolic.svg
 
 %changelog
+* Fri Nov 12 2010 Adam Williamson <awilliam at redhat.com> - 17.1-1
+- bump to 17.1
+- adjust for use of gsettings
+- add notify.patch to fix build against new libnotify
+
 * Sun Jun 06 2010 Rahul Sundaram <sundaram at fedoraproject.org> - 15.3-2
 - Drop the dependency on yelp
 
diff --git a/sources b/sources
index 7965aca..f37c2d0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-db2351582a8bdd20883860baf1862ce2  deja-dup-15.3.tar.bz2
+f37c64c8c3beccfc578198d9bb3b8ace  deja-dup-17.1.tar.bz2