rpms/fwbackups/devel fwbackups-1.43.1-RestoreSetName-Traceback.patch, NONE, 1.1 fwbackups.spec, 1.10, 1.11

[Stewart Adam (firewing)]

Author: firewing

Update of /cvs/extras/rpms/fwbackups/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26606/devel

Modified Files:
	fwbackups.spec 
Added Files:
	fwbackups-1.43.1-RestoreSetName-Traceback.patch 
Log Message:
Fix a non-fatal traceback on startup and fix all rpmlint warnings/errors that have appeared since review time


fwbackups-1.43.1-RestoreSetName-Traceback.patch:

--- NEW FILE fwbackups-1.43.1-RestoreSetName-Traceback.patch ---
--- guicallbacks.py.orig	2007-11-18 20:22:56.000000000 -0500
+++ guicallbacks.py	2007-11-18 20:23:59.000000000 -0500
@@ -774,8 +774,10 @@
 
     def on_RestoreSetNameBox_changed(self, widget):
         self.ui.RestoreSourceSetRadio.set_active(True)
-        self._populateDates(self.ui.RestoreSetNameBox.get_model().get_value(\
-self.ui.RestoreSetNameBox.get_active_iter(), 0), self.ui.RestoreSetDateBox)
+        iter = self.ui.RestoreSetNameBox.get_active_iter()
+        if not iter:
+          return
+        self._populateDates(self.ui.RestoreSetNameBox.get_model().get_value(iter, 0), self.ui.RestoreSetDateBox)
         """try:
             path = self._getPathFromCombobox(self.ui.RestoreSetNameBox.get_model()\
 .get_value(self.ui.RestoreSetNameBox.get_active_iter(), 0))


Index: fwbackups.spec
===================================================================
RCS file: /cvs/extras/rpms/fwbackups/devel/fwbackups.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- fwbackups.spec	13 Aug 2007 11:59:10 -0000	1.10
+++ fwbackups.spec	19 Nov 2007 01:51:06 -0000	1.11
@@ -1,9 +1,10 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
 #define betatag rc3
 Name:              fwbackups
 Version:           1.43.1
 #Release:           0.2.%{betatag}%{?dist}
-Release:           3%{?dist}
+Release:           5%{?dist}
 BuildArch:         noarch
 Summary:           A feature-rich user backup program
 Group:             Applications/Archiving
@@ -12,18 +13,18 @@
 #Source0:           http://www.diffingo.com/downloads/fwbackups/fwbackups-%{version}%{betatag}.tar.gz
 Source0:           http://www.diffingo.com/downloads/fwbackups/fwbackups-%{version}.tar.gz
 Patch0:            fwbackups-ManualFields.patch
+Patch1:            fwbackups-1.43.1-RestoreSetName-Traceback.patch
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:     desktop-file-utils
-BuildRequires:     gettext, scrollkeeper
+BuildRequires:     gettext
 BuildRequires:     python >= 2.4
+BuildRequires:     python-devel
 Requires:          python >= 2.4
 Requires:          pygtk2, pygtk2-libglade
 Requires:          tar, rsync
 Requires:          notify-python, gnome-python2
-
-Requires(post):  scrollkeeper
-Requires(postun):  scrollkeeper
+Requires:          vixie-cron
 
 %description
 %{name} is a feature-rich user backup program that allows users (including
@@ -39,6 +40,10 @@
 %setup -q -n %{name}-%{version}
 pushd src/fwbackups
 %patch0
+%patch1
+popd
+pushd src/help
+sed -i 's|scrollkeeper-update -q|#scrollkeeper-update -q|' Makefile
 popd
 
 %build
@@ -46,39 +51,41 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT PYMODDIR=%{python_sitelib}/%{name}
 
 desktop-file-install --vendor fedora\
     --dir ${RPM_BUILD_ROOT}%{_datadir}/applications\
     ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 
+%{__chmod} 644 ${RPM_BUILD_ROOT}%{_datadir}/gnome/help/%{name}/*/*.xml
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
-
-%postun
-scrollkeeper-update -q || :
-
 %files
 %defattr(-,root,root,-)
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/gnome/help/%{name}/
-%dir %{python_sitelib}/%{name}
-
 %{_bindir}/*
 %{_sbindir}/*
-%{_datadir}/%{name}/*
+%{_datadir}/%{name}/
 %{_datadir}/pixmaps/*
-%{_datadir}/gnome/help/%{name}/*
+%{_datadir}/gnome/help/%{name}/
 %{_datadir}/applications/fedora-*.desktop
-%{python_sitelib}/%{name}/*
+%{python_sitelib}/%{name}/
 
 %doc AUTHORS README COPYING CHANGELOG TODO
 
 %changelog
+* Sun Nov 18 2007 Stewart Adam <s.adam at diffingo.com> 1.43.1-5
+- Remove scrollkeeper scriptlets; Only need that for .omf files
+- Add patch to fix RestoreSetName traceback on startup
+
+* Sat Sep 1 2007 Stewart Adam <s.adam at diffingo.com> 1.43.1-5
+- Add BR python-devel
+
+* Thu Aug 16 2007 Stewart Adam <s.adam at diffingo.com> 1.43.1-4
+- Add Requires vixie-rcron
+
 * Mon Aug 13 2007 Stewart Adam <s.adam at diffingo.com> 1.43.1-3
 - Update license field