rpms/sbackup/EL-5 sbackup-0.10.5-deactivate_dpkg.patch, NONE, 1.1 sbackup-0.10.5-save_on_backup.patch, NONE, 1.1 import.log, 1.1, 1.2 sbackup.spec, 1.1, 1.2

[Simon Wesp]

Author: cassmodiah

Update of /cvs/pkgs/rpms/sbackup/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13741/EL-5

Modified Files:
	import.log sbackup.spec 
Added Files:
	sbackup-0.10.5-deactivate_dpkg.patch 
	sbackup-0.10.5-save_on_backup.patch 
Log Message:


sbackup-0.10.5-deactivate_dpkg.patch:

--- NEW FILE sbackup-0.10.5-deactivate_dpkg.patch ---
--- sbackup-0.10.5.orig/sbackupd.py	2008-06-15 17:39:25.000000000 +0200
+++ sbackup-0.10.5/sbackupd.py	2009-03-05 20:02:54.000000000 +0100
@@ -562,17 +562,17 @@
     pickle.dump( gexclude, gnomevfs.create(tdir+"excludes", 2) )
 
 # Backup list of installed packages (Debian only part)
-try:
-    command = "dpkg --get-selections"
-    s = os.popen( command )
-    if local:
-        d = open( tdir+"packages", "w" )
-    else:
-        d = gnomevfs.create( tdir+"packages", 2 )
-    shutil.copyfileobj( s, d )
-    s.close()
-except:
-    pass
+#try:
+#    command = "dpkg --get-selections"
+#    s = os.popen( command )
+#    if local:
+#        d = open( tdir+"packages", "w" )
+#    else:
+#        d = gnomevfs.create( tdir+"packages", 2 )
+#    shutil.copyfileobj( s, d )
+#    s.close()
+#except:
+#    pass
 # End of Debian only part
 
 # Backup disk table of present block devices

sbackup-0.10.5-save_on_backup.patch:

--- NEW FILE sbackup-0.10.5-save_on_backup.patch ---
--- sbackup-0.10.5.orig/simple-backup-config.py	2008-06-15 17:39:25.000000000 +0200
+++ sbackup-0.10.5.orig/simple-backup-config.py	2009-03-04 21:18:41.000000000 +0100
@@ -453,6 +453,7 @@
 		
 
         def on_backupnow_clicked(self, *args):
+                self.on_save_clicked(*args)
                 pid = os.spawnl( os.P_NOWAIT, self.conf.get("places", "prefix") + "/sbin/sbackupd" )
 		dialog = gtk.MessageDialog(flags=gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, buttons=gtk.BUTTONS_CLOSE, message_format=_("A backup run is initiated in the background. The process id is: ")+str(pid)+".")
 		dialog.run()


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/sbackup/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Jan 2009 14:44:48 -0000	1.1
+++ import.log	5 Mar 2009 20:35:35 -0000	1.2
@@ -1 +1,2 @@
 sbackup-0_10_5-5_fc10:EL-5:sbackup-0.10.5-5.fc10.src.rpm:1232376306
+sbackup-0_10_5-7_fc10:EL-5:sbackup-0.10.5-7.fc10.src.rpm:1236285252


Index: sbackup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sbackup/EL-5/sbackup.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sbackup.spec	19 Jan 2009 14:44:48 -0000	1.1
+++ sbackup.spec	5 Mar 2009 20:35:35 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           sbackup
 Version:        0.10.5
-Release:        5%{?dist}
+Release:        7%{?dist}
 Summary:        Simple Backup Suite for desktop use
 
 Group:          Applications/Archiving
@@ -14,6 +14,8 @@
 Source2:        %{name}-restore.desktop
 Patch0:         %{name}-0.10.5-locales.patch
 Patch1:         %{name}-0.10.5-prefix.patch
+Patch2:         %{name}-0.10.5-save_on_backup.patch
+Patch3:         %{name}-0.10.5-deactivate_dpkg.patch
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -22,7 +24,7 @@
 Requires:       usermode-gtk
 Requires:       pygtk2-libglade
 Requires:       gettext
-Requires:       gnome-vfs2
+Requires:       gvfs
 
 %description
 Simple Backup Suite is a set of backend backup daemon and GNOME
@@ -39,12 +41,19 @@
 %setup -q
 %patch0 -p1 
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 
 %build
 %install
 rm -rf %{buildroot}
-make install -p DESTDIR=%{buildroot} PREFIX=%{_prefix}
+make install \
+     DESTDIR=%{buildroot} \
+     PREFIX=%{_prefix}
+
+#make install -p DESTDIR=%{buildroot} PREFIX=%{_prefix}
+
 
 mkdir -p %{buildroot}%{_mandir}/man8/
 cat simple-backup.8 | gzip -9 -c > %{name}.8.gz
@@ -99,8 +108,8 @@
 SESSION=true
 EOF
 
-mkdir -p %{buildroot}%{_sysconfdir}/{cron.d,cron.daily,cron-hourly,cron.monthly,cron.weekly}/
-touch %{buildroot}%{_sysconfdir}/{cron.d,cron.daily,cron-hourly,cron.monthly,cron.weekly}/%{name}
+mkdir -p %{buildroot}%{_sysconfdir}/cron.{d,daily,hourly,monthly,weekly}/
+touch %{buildroot}%{_sysconfdir}/cron.{d,daily,hourly,monthly,weekly}/%{name}
 
 %find_lang %{name}
 
@@ -129,10 +138,17 @@
 %config %{_sysconfdir}/security/console.apps/%{srg}
 %exclude %{_sbindir}/srestore.*
 %exclude %{_sbindir}/upgrade_backups.*
-%ghost %{_sysconfdir}/cron*/%{name}
+%ghost %{_sysconfdir}/cron.*/%{name}
 
 
 %changelog
+* Thu Mar 05 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.10.5-7
+- Add patch2 to save on backup - Close RHBZ: #486079
+- Add patch3 to deactivate dpkg queries 
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.5-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Fri Jan 16 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.10.5-5
 - Add ownage for cron-files
 - Correct patch0