rpms/fwbackups/FC-6 .cvsignore, 1.8, 1.9 fwbackups.spec, 1.7, 1.8 sources, 1.9, 1.10

[Stewart Adam (firewing)]

Author: firewing

Update of /cvs/extras/rpms/fwbackups/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28569/FC-6

Modified Files:
	.cvsignore fwbackups.spec sources 
Log Message:
Update to 1.43.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fwbackups/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	8 Jul 2007 18:55:55 -0000	1.8
+++ .cvsignore	22 Jul 2007 18:11:42 -0000	1.9
@@ -1 +1 @@
-fwbackups-1.43.0.tar.gz
+fwbackups-1.43.1.tar.gz


Index: fwbackups.spec
===================================================================
RCS file: /cvs/extras/rpms/fwbackups/FC-6/fwbackups.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fwbackups.spec	8 Jul 2007 18:55:55 -0000	1.7
+++ fwbackups.spec	22 Jul 2007 18:11:42 -0000	1.8
@@ -1,12 +1,12 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 #define betatag rc3
 Name:              fwbackups
-Version:           1.43.0
+Version:           1.43.1
 #Release:           0.2.%{betatag}%{?dist}
 Release:           1%{?dist}
 BuildArch:         noarch
 Summary:           A feature-rich user backup program
-Group:             Applications/System
+Group:             Applications/Archiving
 License:           GPL
 URL:               http://www.diffingo.com/content/view/12/45/lang,en/
 #Source0:           http://www.diffingo.com/downloads/fwbackups/fwbackups-%{version}%{betatag}.tar.gz
@@ -14,23 +14,27 @@
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:     desktop-file-utils
-BuildRequires:     gettext
+BuildRequires:     gettext, scrollkeeper
 BuildRequires:     python >= 2.4
 Requires:          python >= 2.4
-Requires:          notify-python
 Requires:          pygtk2, pygtk2-libglade
 Requires:          tar, rsync
+Requires:          notify-python, gnome-python2
+
+Requires(post):  scrollkeeper
+Requires(postun):  scrollkeeper
 
 %description
-fwbackups is a feature-rich user backup program that allows users (including
+%{name} is a feature-rich user backup program that allows users (including
 but not limited to root) to backup their files on demand or periodically via
 backup sets. Each set may have different settings meaning users can backup
 groups of files and folders to different destinations at different times.
-Restores can be performed at any time using an existing backup from fwbackups
+Restores can be performed at any time using an existing backup from %{name}
 or from the contents of an external folder or archive.
 
+
 %prep
-#setup -q -n %{name}-%{version}%{betatag}
+#%setup -q -n %{name}-%{version}%{betatag}
 %setup -q -n %{name}-%{version}
 
 
@@ -43,28 +47,41 @@
 
 desktop-file-install --vendor fedora\
     --dir ${RPM_BUILD_ROOT}%{_datadir}/applications\
-    ${RPM_BUILD_ROOT}%{_datadir}/applications/fwbackups.desktop
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/fwbackups.desktop
-rm -f ${RPM_BUILD_ROOT}%{_sbindir}/fwbackups-uninstall
+    ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
+rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+
+%postun
+scrollkeeper-update -q || :
 
 %files
 %defattr(-,root,root,-)
-%dir %{_datadir}/fwbackups
-%dir %{python_sitelib}/fwbackups
-
-%{_bindir}/fwbackups*
-%{_datadir}/fwbackups/*
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/gnome/help/%{name}/
+%dir %{python_sitelib}/%{name}
+
+%{_bindir}/*
+%{_sbindir}/*
+%{_datadir}/%{name}/*
+%{_datadir}/pixmaps/*
+%{_datadir}/gnome/help/%{name}/*
 %{_datadir}/applications/fedora-*.desktop
-%{python_sitelib}/fwbackups/*
-%{_datadir}/pixmaps/*fwbackups*
+%{python_sitelib}/%{name}/*
 
 %doc AUTHORS README COPYING CHANGELOG TODO
 
 %changelog
+* Sun Jul 22 2007 Stewart Adam <s.adam at diffingo.com> 1.43.1-1
+- Change get_python_lib() to get_python_lib(1) for x86_64
+- Add new Requires and Post(un) scripts because of new documentation
+- Switch all instances of fwbackups to %%{name} for consistency
+- Update to 1.43.1 (see CHANGELOG file for details on version changes)
+
 * Sun Jul 8 2007 Stewart Adam <s.adam at diffingo.com> 1.43.0-1
 - Add BuildRequires python 2.4, gettext
 - Add Requires python 2.4, notify-python


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fwbackups/FC-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	8 Jul 2007 18:55:55 -0000	1.9
+++ sources	22 Jul 2007 18:11:42 -0000	1.10
@@ -1 +1 @@
-bd137871e6868f912a6dc381bbb6de24  fwbackups-1.43.0.tar.gz
+093cc5baf9584206a1d6411bb27869e5  fwbackups-1.43.1.tar.gz