[backintime/f19] Fix broken deps.

[Christopher Meng]

commit 6d7849c0eb8020075ad572560752f2a9c2ee15f4
Author: Christopher Meng <rpm at cicku.me>
Date:   Tue Nov 26 09:24:09 2013 +0800

    Fix broken deps.

 backintime.spec |  106 ++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 74 insertions(+), 32 deletions(-)
---
diff --git a/backintime.spec b/backintime.spec
index 751c3c0..8e08d0f 100644
--- a/backintime.spec
+++ b/backintime.spec
@@ -1,6 +1,6 @@
 Name:            backintime
 Version:         1.0.28
-Release:         1%{?dist}
+Release:         2%{?dist}
 Summary:         Simple backup tool inspired from the Flyback project and TimeVault
 License:         GPLv2+
 URL:             http://backintime.le-web.org
@@ -8,7 +8,7 @@ Source0:         http://backintime.le-web.org/download/%{name}/%{name}-%{version
 BuildArch:       noarch
 BuildRequires:   desktop-file-utils
 BuildRequires:   gettext
-Requires:        python-keyring
+Requires:        %{name}-common = %{version}-%{release}
 
 %description
 Back In Time is a simple backup system for Linux inspired from 
@@ -17,10 +17,10 @@ snapshots of a specified set of directories.
 
 %package         common
 Summary:         Common files for the %{name}, a simple backup tool
-Requires:        python
-Requires:        rsync
 Requires:        cronie
+Requires:        openssh-clients
 Requires:        python-keyring
+Requires:        rsync
 
 %description     common
 Back In Time is a simple backup system for Linux inspired from 
@@ -32,34 +32,50 @@ This package contains non GUI files used by different GUI frontends.
 %package         gnome
 Summary:         GNOME frontend for %{name}
 Requires:        %{name}-common = %{version}-%{release}
-Requires:        pygtk2-libglade
-Requires:        gnome-python2
+Requires:        %{name}-notify = %{version}-%{release}
+Requires:        gnome-python2-gnome
 Requires:        meld
-Requires:        usermode-gtk
 Requires:        notify-python
-Requires:        gnome-python2-gnome
+Requires:        pygtk2-libglade
+Requires:        python-SecretStorage
+Requires:        usermode-gtk
 
 %description     gnome
-Back In Time is a simple backup system for Linux inspired from 
+BackInTime is a simple backup system for Linux inspired from 
 “flyback project” and “TimeVault”. The backup is done by taking 
 snapshots of a specified set of directories.
 
-This package contains the GNOME frontend of Back In Time.
+This package contains the GNOME frontend of BackInTime.
 
 %package         kde
-Summary:         KDE frontend for %{name}
+Summary:         KDE4 frontend for %{name}
 Requires:        %{name}-common = %{version}-%{release}
-Requires:        xorg-x11-utils
+Requires:        %{name}-notify = %{version}-%{release}
+Requires:        kdesdk
 Requires:        PyKDE4
+#Requires:        python-SecretStorage
 Requires:        usermode-gtk
-Requires:        kdesdk
+Requires:        xorg-x11-utils
 
 %description     kde
-Back In Time is a simple backup system for Linux inspired from 
+BackInTime is a simple backup system for Linux inspired from 
+“flyback project” and “TimeVault”. The backup is done by taking 
+snapshots of a specified set of directories.
+
+This package contains the KDE4 frontend of BackInTime.
+
+%package         notify
+Summary:         Notifications using libnotify for %{name}
+Requires:        %{name}-common = %{version}-%{release}
+Requires:        libnotify
+
+%description     notify
+BackInTime is a simple backup system for Linux inspired from 
 “flyback project” and “TimeVault”. The backup is done by taking 
 snapshots of a specified set of directories.
 
-This package contains the KDE frontend of Back In Time.
+This package contains notifications plugin of BackInTime based
+on libnotify.
 
 %prep
 %setup -qc %{name}-%{version}
@@ -73,40 +89,54 @@ sed -i 's|Exec=backintime-kde4|Exec=backintime-kde4-root|g' \
        kde4/%{name}-kde4-root.desktop
 
 %build
-cd common
-%configure
+pushd common
+%configure --no-fuse-group
 make %{?_smp_mflags}
+popd
 
-cd ../gnome
+pushd gnome
 %configure --no-check
 make %{?_smp_mflags}
+popd
 
-cd ../kde4
+pushd kde4
 %configure --no-check
 make %{?_smp_mflags}
+popd
 
-cd ..
+pushd notify
+%configure --no-check
+make %{?_smp_mflags}
+popd
 
 %install
-cd common
+pushd common
 make install \
      INSTALL="install -p" \
      PREFIX="%{_prefix}" \
      DEST="%{buildroot}%{_prefix}"
+popd
 
-cd ../gnome
+pushd gnome
 make install \
      INSTALL="install -p" \
      PREFIX="%{_prefix}" \
      DEST="%{buildroot}%{_prefix}"
+popd
 
-cd ../kde4
+pushd kde4
 make install \
      INSTALL="install -p" \
      PREFIX="%{_prefix}" \
      DEST="%{buildroot}%{_prefix}"
+popd
 
-cd ..
+pushd notify
+make install \
+     INSTALL="install -p" \
+     PREFIX="%{_prefix}" \
+     DEST="%{buildroot}%{_prefix}"
+popd
 
 desktop-file-install \
         --dir=%{buildroot}%{_datadir}/applications \
@@ -134,7 +164,6 @@ cp -p %{buildroot}%{_bindir}/%{name}-kde4 \
 
 ln -s consolehelper \
       %{buildroot}%{_bindir}/%{name}-gnome-root
-
 ln -s consolehelper \
       %{buildroot}%{_bindir}/%{name}-kde4-root
 
@@ -171,42 +200,55 @@ EOF
 %find_lang %{name}
 
 %files common -f %{name}.lang
+%doc %{_docdir}/%{name}/
+%doc %{_docdir}/%{name}-common/
 %exclude %{_sysconfdir}/xdg/autostart/%{name}.desktop
 %{_bindir}/%{name}
 %{_bindir}/%{name}-askpass
 %dir %{_datadir}/%{name}/
 %{_datadir}/%{name}/common/
-%{_datadir}/%{name}/plugins/
+%dir %{_datadir}/%{name}/plugins/
+%{_datadir}/%{name}/plugins/user*plugin*
 %{_mandir}/man1/%{name}*
-%doc %{_docdir}/%{name}/
-%doc %{_docdir}/%{name}-common/
 
 %files gnome
+%doc %{_datadir}/gnome/help/%{name}/
+%doc %{_docdir}/%{name}-gnome/
 %{_bindir}/%{name}-gnome
 %{_bindir}/%{name}-gnome-root
 %{_sbindir}/%{name}-gnome-root
 %{_datadir}/applications/%{name}-gnome.desktop
 %{_datadir}/applications/%{name}-gnome-root.desktop
 %{_datadir}/%{name}/gnome/
-%doc %{_datadir}/gnome/help/%{name}/
-%doc %{_docdir}/%{name}-gnome/
+%{_datadir}/%{name}/plugins/gnomeplugin*
 %{_datadir}/omf/%{name}/
 %config(noreplace) %{_sysconfdir}/pam.d/%{name}-gnome-root
 %config %{_sysconfdir}/security/console.apps/%{name}-gnome-root
 
 %files kde
+%doc %{_datadir}/doc/kde/HTML/en/%{name}/
+%doc %{_docdir}/%{name}-kde4/
 %{_bindir}/%{name}-kde4
 %{_bindir}/%{name}-kde4-root
 %{_sbindir}/%{name}-kde4-root
 %{_datadir}/applications/kde4/%{name}-kde4.desktop
 %{_datadir}/applications/kde4/%{name}-kde4-root.desktop
 %{_datadir}/backintime/kde4/
-%doc %{_datadir}/doc/kde/HTML/en/%{name}/
-%doc %{_docdir}/%{name}-kde4/
+%{_datadir}/%{name}/plugins/kde4plugin*
 %config(noreplace) %{_sysconfdir}/pam.d/%{name}-kde4-root
 %config %{_sysconfdir}/security/console.apps/%{name}-kde4-root
 
+%files notify
+%doc %{_docdir}/%{name}-notify/
+%{_datadir}/%{name}/plugins/notifyplugin*
+
 %changelog
+* Sun Nov 24 2013 Christopher Meng <rpm at cicku.me> - 1.0.28-2
+- Enable notify plugin, separate plugins into different subpackages.
+- Add missing python-SecretStorage dependency(BZ#1031403).
+- Remove fuse group check(BZ#1010728).
+- python-keyring incompatibility fix(BZ#1026542).
+
 * Mon Oct 21 2013 Christopher Meng <rpm at cicku.me> - 1.0.28-1
 - New version(BZ#1021192) with fixes(BZ#1014293),(BZ#1014976).