rpms/fwbackups/FC-6 .cvsignore, 1.5, 1.6 fwbackups.spec, 1.4, 1.5 sources, 1.6, 1.7

Fri May 25 21:41:05 UTC 2007

Author: firewing

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

Modified Files:
	.cvsignore fwbackups.spec sources 
Log Message:
On second thought, don't merge the specfiles... Just add another entry.

Also, my bad - I thought "make new-sources" was for SRPMs... it' for tarballs.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fwbackups/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6

--- .cvsignore	25 May 2007 21:27:09 -0000	1.5
+++ .cvsignore	25 May 2007 21:40:30 -0000	1.6
@@ -1 +1 @@
-fwbackups-1.43.0-0.1.rc2.fc7.src.rpm
+fwbackups-1.43.0rc2.tar.gz


Index: fwbackups.spec
===================================================================
RCS file: /cvs/extras/rpms/fwbackups/FC-6/fwbackups.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fwbackups.spec	21 Mar 2007 21:10:37 -0000	1.4
+++ fwbackups.spec	25 May 2007 21:40:30 -0000	1.5
@@ -1,84 +1,44 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-
-Name:            fwbackups
-Version:        1.42.3a
-Release:        1%{?dist}
-BuildArch:     noarch
-Summary:     A feature-rich user backup program
-
-Group:           Applications/System
-License:        GPL
+%define betatag rc2
+Name:              fwbackups
+Version:           1.43.0
+Release:           0.1.%{betatag}%{?dist}
+BuildArch:         noarch
+Summary:           A feature-rich user backup program
+Group:             Applications/System
+License:           GPL
 URL:               http://www.diffingo.com/content/view/12/45/lang,en/
-Source0:       http://www.diffingo.com/downloads/fwbackups/fwbackups-%{version}.tar.gz
-BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:           http://www.diffingo.com/downloads/fwbackups/fwbackups-%{version}%{betatag}.tar.gz
+BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:    desktop-file-utils
-Requires:              pygtk2 pygtk2-libglade
-Requires:              redhat-artwork usermode
+BuildRequires:     desktop-file-utils
+Requires:          pygtk2, pygtk2-libglade
+Requires:          redhat-artwork, usermode
+Requires:          tar, rsync
 
 %description
-fwbackups is a user backups program that can run a backup on-the-spot based
-on user-specified paths, or by it's automated backup feature which will backup
-user-specified paths and backup them to an appropriate location automatically,
-at a specified time and date.
+fwbackups is a feature-rich user backups program that can run a backup once
+based on user-specified files and folders, or run backups periodically with
+it's backup set feature. Backup sets are groups of paths that have their
+own paths, destination, time and date, and options to allow maximum
+flexibility. Backup restores are also supported.
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{betatag}
+
 
 %build
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
-#install -d -p -m755 etc/fwbackups ${RPM_BUILD_ROOT}%{_sysconfdir}/fwbackups
-#install -d -p -m755 usr/lib/python-vnumb/site-packages/fwbackups ${RPM_BUILD_ROOT}%{python_sitelib}/fwbackups
-#install -d -p -m755 usr/share/fwbackups ${RPM_BUILD_ROOT}%{_datadir}/fwbackups
-#install -d -p -m755 ${RPM_BUILD_ROOT}%{_docdir}/fwbackups
-#install -d -p -m755 ${RPM_BUILD_ROOT}%{_sbindir}
-# This one we DO need because ln doesn't create the directories like install did
-install -d -p -m755 ${RPM_BUILD_ROOT}%{_bindir}
-
-install -D -p -m644 etc/fwbackups/fwbackups.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/fwbackups/fwbackups.conf
-
-install -D -p -m444 usr/share/fwbackups/fwbackups.conf.default ${RPM_BUILD_ROOT}%{_datadir}/fwbackups/fwbackups.conf.default
-
-install -D -p -m644 etc/pam.d/fwbackups ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/fwbackups
-install -D -p -m644 etc/pam.d/fwbackups-run ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/fwbackups-run
-
-install -D -p -m644 etc/security/console.apps/fwbackups ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps/fwbackups
-install -D -p -m644 etc/security/console.apps/fwbackups-run ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps/fwbackups-run 
-
-
-
-install -D -p -m755 usr/share/fwbackups/fwbackups-runapp.py ${RPM_BUILD_ROOT}%{_datadir}/fwbackups/fwbackups-runapp.py
-
-install -D -p -m644 usr/lib/python-vnumb/site-packages/fwbackups/__init__.py ${RPM_BUILD_ROOT}%{python_sitelib}/fwbackups/__init__.py
-
-install -D -p -m644 usr/lib/python-vnumb/site-packages/fwbackups/Backuper.py ${RPM_BUILD_ROOT}%{python_sitelib}/fwbackups/Backuper.py
-
-install -D -p -m644 usr/lib/python-vnumb/site-packages/fwbackups/BaseClasses.py ${RPM_BUILD_ROOT}%{python_sitelib}/fwbackups/BaseClasses.py
-
-install -D -p -m644 usr/lib/python-vnumb/site-packages/fwbackups/Callbacks.py ${RPM_BUILD_ROOT}%{python_sitelib}/fwbackups/Callbacks.py
-
-install -D -p -m644 usr/lib/python-vnumb/site-packages/fwbackups/shutil_modded.py ${RPM_BUILD_ROOT}%{python_sitelib}/fwbackups/shutil_modded.py
-
-install -D -p -m644 usr/share/fwbackups/fwbackups-new.glade ${RPM_BUILD_ROOT}%{_datadir}/fwbackups/fwbackups-new.glade
-
-install -D -p -m755 usr/sbin/fwbackups ${RPM_BUILD_ROOT}%{_sbindir}/fwbackups
-install -D -p -m755 usr/sbin/fwbackups-run ${RPM_BUILD_ROOT}%{_sbindir}/fwbackups-run
-
-ln -sf ../../../usr/bin/consolehelper ${RPM_BUILD_ROOT}%{_bindir}/fwbackups
-ln -sf ../../../usr/bin/consolehelper ${RPM_BUILD_ROOT}%{_bindir}/fwbackups-run
-
-desktop-file-install --vendor fedora\
-    --dir ${RPM_BUILD_ROOT}%{_datadir}/applications\
-    --add-category X-Fedora\
-    usr/share/applications/fwbackups.desktop
 desktop-file-install --vendor fedora\
     --dir ${RPM_BUILD_ROOT}%{_datadir}/applications\
-    --add-category X-Fedora\
-    usr/share/applications/fwbackups-run.desktop
+    ${RPM_BUILD_ROOT}%{_datadir}/applications/fwbackups.desktop
+rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/fwbackups.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -86,27 +46,21 @@
 
 %files
 %defattr(-,root,root,-)
-%dir %{_sysconfdir}/fwbackups
 %dir %{_datadir}/fwbackups
 %dir %{python_sitelib}/fwbackups
 
-%{_bindir}/fwbackups
-%{_bindir}/fwbackups-run
-%{_sbindir}/fwbackups
-%{_sbindir}/fwbackups-run
+%{_bindir}/*
+%{_sbindir}/*
 %{_datadir}/fwbackups/*
 %{_datadir}/applications/fedora-*.desktop
 %{python_sitelib}/fwbackups/*
 
-%config(noreplace) %{_sysconfdir}/fwbackups/fwbackups.conf
-%config(noreplace) %{_sysconfdir}/security/console.apps/fwbackups
-%config(noreplace) %{_sysconfdir}/security/console.apps/fwbackups-run
-%config(noreplace) %{_sysconfdir}/pam.d/fwbackups
-%config(noreplace) %{_sysconfdir}/pam.d/fwbackups-run
-
-%doc README COPYING CHANGELOG
+%doc README COPYING CHANGELOG TODO
 
 %changelog
+* Fri May 25 2007 Stewart Adam <s.adam at diffingo.com> 1.43.0-0.1.rc2
+- Update to 1.43.0 rc2 (see CHANGELOG file for details on version changes)
+
 * Wed Mar 21 2007 Stewart Adam <s.adam at diffingo.com> 1.42.3a-1
 - Fix startup traceback on some systems
 
@@ -116,6 +70,9 @@
 * Sun Jan 28 2007 Stewart Adam <s.adam at diffingo.com> 1.42.2-1
 - Update to version 1.42.2 (see CHANGELOG file for details on version changes)
 
+* Sat Sep 30 2006 Stewart Adam <s.adam at diffingo.com> 1.42.1-3
+- Clean up spec for final submission to Fedora Extras
+
 * Sat Sep 30 2006 Stewart Adam <s.adam at diffingo.com> 1.42.1-2
 - Match upstream md5sum
 - Fix capitals in %%Source0 tag


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fwbackups/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	25 May 2007 21:27:09 -0000	1.6
+++ sources	25 May 2007 21:40:30 -0000	1.7
@@ -1 +1 @@
-9f048d02f7f92250780e26655b050d1e  fwbackups-1.43.0-0.1.rc2.fc7.src.rpm
+570d53244cd0af082e5bb2a436d0b002  fwbackups-1.43.0rc2.tar.gz


