rpms/fwbackups/F-9 .cvsignore, 1.7, 1.8 fwbackups.spec, 1.12, 1.13 sources, 1.7, 1.8 fwbackups-1.43.1-RestoreSetName-Traceback.patch, 1.1, NONE fwbackups-ManualFields.patch, 1.1, NONE

[Stewart Adam (firewing)]

Author: firewing

Update of /cvs/extras/rpms/fwbackups/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29363/F-9

Modified Files:
	.cvsignore fwbackups.spec sources 
Removed Files:
	fwbackups-1.43.1-RestoreSetName-Traceback.patch 
	fwbackups-ManualFields.patch 
Log Message:
Update to 1.43.2rc2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fwbackups/F-9/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	22 Jul 2007 18:11:45 -0000	1.7
+++ .cvsignore	2 Jun 2008 01:34:32 -0000	1.8
@@ -1 +1 @@
-fwbackups-1.43.1.tar.gz
+fwbackups-1.43.2rc2.tar.gz


Index: fwbackups.spec
===================================================================
RCS file: /cvs/extras/rpms/fwbackups/F-9/fwbackups.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- fwbackups.spec	19 Nov 2007 02:05:42 -0000	1.12
+++ fwbackups.spec	2 Jun 2008 01:34:32 -0000	1.13
@@ -1,29 +1,31 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-#define betatag rc3
+
+# can't use 1.43.2rc2 as version for non-testing releases: 1.43.2beta > 1.43.2
+%define pretag rc2
+
 Name:              fwbackups
-Version:           1.43.1
-#Release:           0.2.%{betatag}%{?dist}
-Release:           6%{?dist}
+Version:           1.43.2
+#Release:           1%{?dist}
+Release:           0.1.%{pretag}%{?dist}
 BuildArch:         noarch
 Summary:           A feature-rich user backup program
 Group:             Applications/Archiving
 License:           GPLv2+
 URL:               http://www.diffingo.com/content/view/12/45/lang,en/
-#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
+#Source0:           http://www.diffingo.com/downloads/fwbackups/fwbackups-%{version}.tar.gz
+Source0:           http://www.diffingo.com/downloads/fwbackups/fwbackups-%{version}%{pretag}.tar.gz
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:     desktop-file-utils
 BuildRequires:     gettext
-BuildRequires:     python-devel >= 2.4
+BuildRequires:     intltool, automake
 BuildRequires:     libxml2
+BuildRequires:     python-devel >= 2.4
 Requires:          python >= 2.4
 Requires:          pygtk2, pygtk2-libglade
 Requires:          tar, rsync
 Requires:          notify-python, gnome-python2
-Requires:          vixie-cron
+Requires:          /usr/bin/crontab
 
 %description
 %{name} is a feature-rich user backup program that allows users (including
@@ -35,46 +37,51 @@
 
 
 %prep
-#%setup -q -n %{name}-%{version}%{betatag}
-%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
+%setup -q -n %{name}-%{version}%{pretag}
+
+# uncomment me as needed
+#pushd src/fwbackups
+#patch0
+#popd
 
 %build
-make %{?_smp_mflags}
+%configure
+# We don't implement this yet
+# make %{?_smp_mflags}
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT PYMODDIR=%{python_sitelib}/%{name}
+make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install --vendor fedora\
     --dir ${RPM_BUILD_ROOT}%{_datadir}/applications\
+    --delete-original \
     ${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
 
 %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
+%doc AUTHORS COPYING ChangeLog NEWS TODO README
 
 %changelog
+* Sat May 31 2008 Stewart Adam <s.adam at diffingo.com> 1.43.2-0.1.rc2
+- Update to 1.43.2rc2
+- Don't require vixie-cron, but do require /usr/bin/crontab
+
 * Sun Nov 18 2007 Stewart Adam <s.adam at diffingo.com> 1.43.1-6
 - BR: libxml2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fwbackups/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	22 Jul 2007 18:11:45 -0000	1.7
+++ sources	2 Jun 2008 01:34:32 -0000	1.8
@@ -1 +1 @@
-093cc5baf9584206a1d6411bb27869e5  fwbackups-1.43.1.tar.gz
+8d0695ce5f99cfc4f56de1cb0ebda004  fwbackups-1.43.2rc2.tar.gz


--- fwbackups-1.43.1-RestoreSetName-Traceback.patch DELETED ---


--- fwbackups-ManualFields.patch DELETED ---