[deja-dup] New upstream release Drop defattr since recent rpm makes it redundant Add control-center-devel as bu

[Rahul Sundaram]

commit 1bebc762bffec9ffecfa31bed19c14645b0bbb59
Author: Rahul Sundaram <sundaram at fedoraproject.org>
Date:   Mon May 9 18:29:50 2011 +0530

    New upstream release
    Drop defattr since recent rpm makes it redundant
    Add control-center-devel as build requires
    Update gsettings scriptlets to match latest guidelines
    Drop obsolete and invalid configuration options

 .gitignore    |    1 +
 deja-dup.spec |   50 +++++++++++++++++++++-----------------------------
 sources       |    2 +-
 3 files changed, 23 insertions(+), 30 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 14d44b0..ea589cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ deja-dup-15.3.tar.bz2
 /deja-dup-18.0.tar.bz2
 /deja-dup-18.1.tar.bz2
 /deja-dup-18.1.1.tar.bz2
+/deja-dup-19.1.tar.bz2
diff --git a/deja-dup.spec b/deja-dup.spec
index a43146a..1939ce0 100644
--- a/deja-dup.spec
+++ b/deja-dup.spec
@@ -1,18 +1,18 @@
 Name:           deja-dup
-Version:        18.1.1
+Version:        19.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}/18/%{version}/+download/%{name}-%{version}.tar.bz2
+Source0:        http://launchpad.net/%{name}/20/%{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 GConf2-devel glib2-devel libnotify-devel
 BuildRequires:  po4a unique-devel nautilus-devel gnome-keyring-devel
-BuildRequires:  gtk3-devel unique3-devel
+BuildRequires:  gtk3-devel unique3-devel control-center-devel
 Requires:       duplicity python-cloudfiles
 Requires(pre):  GConf2
 Requires(post): GConf2
@@ -36,17 +36,14 @@ Features:
 %setup -q
 
 %build
-%configure --disable-static --disable-schemas-install --with-gtk3 --with-nautilus --with-gnu-ld
+%configure --disable-static --with-nautilus --with-gnu-ld
 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-3.0/*.la
-rm -rf %{buildroot}/%{_datadir}/icons/Humanity/
-rm -rf %{buildroot}/%{_datadir}/icons/ubuntu-mono-dark
-rm -rf %{buildroot}/%{_datadir}/icons/ubuntu-mono-light
+rm -f %{buildroot}/%{_libdir}/control-center-1/panels/libdeja-dup.la
+rm -rf %{buildroot}/%{_datadir}/icons/ubuntu-mono-*
 
 %find_lang %{name} --with-gnome
 
@@ -57,42 +54,37 @@ touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 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
+    glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 fi
 
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-glib-compile-schemas %{_datadir}/glib-2.0/schemas
-
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc COPYING NEWS
-%{_bindir}/deja-*
-%{_mandir}/man1/deja-dup.1.gz
-%{_mandir}/*/man1/deja-dup.1.gz
-%{_mandir}/man1/deja-dup-preferences.1.gz
-%{_mandir}/*/man1/deja-dup-preferences.1.gz
 %{_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-3.0/libnautilus-deja-dup.so
-%dir %{_libdir}/deja-dup
-%{_libdir}/deja-dup/deja-dup-monitor
-%dir %{_datadir}/deja-dup
-%dir %{_datadir}/deja-dup/ui
-%{_datadir}/deja-dup/ui/restore-missing.ui
+%{_libdir}/control-center-1/panels/libdeja-dup.so*
+%{_libdir}/nautilus/extensions-3.0/libdeja-dup.so
+%{_libexecdir}/deja-dup/deja-dup*
 %{_datadir}/applications/deja-dup.desktop
-%{_datadir}/icons/hicolor/scalable/devices/deja-dup-cloud.svg
-%{_datadir}/icons/hicolor/scalable/actions/deja-dup-backup.svg
-%{_datadir}/icons/hicolor/scalable/actions/deja-dup-restore.svg
+%{_datadir}/deja-dup/ui/restore-missing.ui
 %{_datadir}/icons/hicolor/*/apps/deja-dup.png
 %{_datadir}/icons/hicolor/scalable/apps/deja-dup-symbolic.svg
+%{_datadir}/icons/hicolor/scalable/devices/deja-dup-cloud.svg
 
 %changelog
+* Mon May 09 2011 Rahul Sundaram <sundaram at fedoraproject.org> - 19.1-1
+- New upstream release
+- Drop defattr since recent rpm makes it redundant 
+- Add control-center-devel as build requires
+- Update gsettings scriptlets to match latest guidelines
+- Drop obsolete and invalid configuration options
+
 * Sat Apr 16 2011 Chris Smart <csmart at fedoraproject.org> - 18.1.1-1
-- Update to latest upstream realease, which will "actually work with NetworkManager 0.9"
+- Update to latest upstream release, which will "actually work with NetworkManager 0.9"
 - http://bazaar.launchpad.net/~deja-dup-team/deja-dup/18/revision/888
 
 * Wed Apr 13 2011 Chris Smart <csmart at fedoraproject.org> - 18.1-1
diff --git a/sources b/sources
index 0ce95fb..0b58eb4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-35fefaf346dbb341208e91ce4c6944e4  deja-dup-18.1.1.tar.bz2
+d2e1bc76f0103c6de7b2d9936a984894  deja-dup-19.1.tar.bz2