rpms/fwfstab/F-7 .cvsignore, 1.2, 1.3 fwfstab.spec, 1.3, 1.4 sources, 1.2, 1.3

Fri Oct 19 15:06:54 UTC 2007

Author: firewing

Update of /cvs/extras/rpms/fwfstab/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19970/F-7

Modified Files:
	.cvsignore fwfstab.spec sources 
Log Message:
Update to v0.02



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fwfstab/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

--- .cvsignore	3 Nov 2006 13:25:12 -0000	1.2
+++ .cvsignore	19 Oct 2007 15:06:20 -0000	1.3
@@ -1 +1 @@
-fwfstab-0.01.1.tar.gz
+fwfstab-0.02.tar.gz


Index: fwfstab.spec
===================================================================
RCS file: /cvs/extras/rpms/fwfstab/F-7/fwfstab.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fwfstab.spec	9 Dec 2006 17:15:14 -0000	1.3
+++ fwfstab.spec	19 Oct 2007 15:06:20 -0000	1.4
@@ -1,86 +1,73 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%{!?fedoraver: %define fedoraver  %(test -e /etc/fedora-release && rpm -q fedora-release --qf "%{VERSION}")}
+Name:        fwfstab
+Version:     0.02
+Release:     1%{?dist}
+BuildArch:   noarch
+Summary:     A graphical file system table editor
+
+Group:       Applications/System
+License:     GPLv2+
+URL:         http://www.diffingo.com/content/view/32/45/lang,en/
+Source0:     http://www.diffingo.com/downloads/fwfstab/fwfstab-%{version}.tar.gz
+BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:   desktop-file-utils
+Requires:        pygtk2 pygtk2-libglade
+Requires:        usermode
 
-Name:		fwfstab
-Version:		0.01.1
-Release:		3%{?dist}
-BuildArch:	noarch
-Summary:	A graphical file system table editor
-
-Group:		Applications/System
-License:		GPL
-URL:		http://www.diffingo.com/content/view/32/45/lang,en/
-Source0:		http://www.diffingo.com/downloads/fwfstab/fwfstab-%{version}.tar.gz
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:		desktop-file-utils
-Requires:		pygtk2 pygtk2-libglade redhat-artwork usermode
 %description
-fwfstab is a graphical file system table (fstab) editor, used to edit the 
+%{name} is a graphical file system table (fstab) editor, used to edit the 
 /etc/fstab file. It lets users add, edit or remove new entries in a simple,
 straight-forward way. It is meant to make the task of editing the file
 system table easier without sacrificing flexibility.
 
+Warning: At the moment, using fwfstab removes all comments from the fstab.
 
 %prep
 %setup -q
 
-
 %build
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d -p -m755 ${RPM_BUILD_ROOT}%{_bindir}
-
-install -D -p -m644 etc/pam.d/fwfstab ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/fwfstab
-
-install -D -p -m644 etc/security/console.apps/fwfstab ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps/fwfstab
-
-install -D -p -m755 usr/share/fwfstab/fwfstab-runapp.py ${RPM_BUILD_ROOT}%{_datadir}/fwfstab/fwfstab-runapp.py
-
-install -D -p -m644 usr/lib/python2.4/site-packages/fwfstab/__init__.py ${RPM_BUILD_ROOT}%{python_sitelib}/fwfstab/__init__.py
-
-install -D -p -m644 usr/lib/python2.4/site-packages/fwfstab/BaseClasses.py ${RPM_BUILD_ROOT}%{python_sitelib}/fwfstab/BaseClasses.py
-
-install -D -p -m644 usr/lib/python2.4/site-packages/fwfstab/Callbacks.py ${RPM_BUILD_ROOT}%{python_sitelib}/fwfstab/Callbacks.py
-
-install -D -p -m644 usr/share/fwfstab/mountoptions ${RPM_BUILD_ROOT}%{_datadir}/fwfstab/mountoptions
-
-install -D -p -m644 usr/share/fwfstab/fwfstab.glade ${RPM_BUILD_ROOT}%{_datadir}/fwfstab/fwfstab.glade
-
-install -D -p -m755 usr/sbin/fwfstab ${RPM_BUILD_ROOT}%{_sbindir}/fwfstab
-
-ln -sf ../../../usr/bin/consolehelper ${RPM_BUILD_ROOT}%{_bindir}/fwfstab
+make
+make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install --vendor fedora\
-	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications\
-	--add-category X-Fedora\
-	usr/share/applications/fwfstab.desktop
+    --dir ${RPM_BUILD_ROOT}%{_datadir}/applications\
+    --delete-original \
+    $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+
+rm -f $RPM_BUILD_ROOT%{_sbindir}/%{name}-uninstall
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
 %defattr(-,root,root,-)
-%dir %{_datadir}/fwfstab
-%dir %{python_sitelib}/fwfstab
-
-%{_bindir}/fwfstab
-%{_sbindir}/fwfstab
-%{_datadir}/fwfstab/*
+%doc AUTHORS README COPYING CHANGELOG TODO
+%dir %{_datadir}/%{name}
+%dir %{python_sitelib}/%{name}
+%{_bindir}/%{name}
+%{_sbindir}/%{name}
+%{_datadir}/%{name}/*
+%{_datadir}/pixmaps/%{name}.svg
 %{_datadir}/applications/fedora-*.desktop
-%{python_sitelib}/fwfstab/*
-
-%config(noreplace) %{_sysconfdir}/security/console.apps/fwfstab
-%config(noreplace) %{_sysconfdir}/pam.d/fwfstab
-
-%doc README COPYING CHANGELOG
+%{python_sitelib}/%{name}/*
+%config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
+%config(noreplace) %{_sysconfdir}/pam.d/%{name}
 
 %changelog
+* Thu Oct 18 2007 Stewart Adam <s.adam AT diffingo DOT com> 0.02-1
+- Update to version 0.02
+- Drop X-Fedora from .desktop file
+- Why do I define the fedora version and never use it?
+- No longer requires redhat-artwork
+
+* Mon Aug 13 2007 Stewart Adam <s.adam AT diffingo DOT com> 0.01.1-4
+- Update license tag
 
 * Sat Dec 9 2006 Stewart Adam <s.adam AT diffingo DOT com> 0.01.1-3
 - 'make tag' problems, bumping...
@@ -88,16 +75,16 @@
 * Sat Dec 9 2006 Stewart Adam <s.adam AT diffingo DOT com> 0.01.1-2
 - Rebuild for new python
 
-* Thu Nov 2 2006 Stewart Adam <s DOT adam AT diffingo DOT com> 0.01.1-1
+* Thu Nov 2 2006 Stewart Adam <s.adam AT diffingo DOT com> 0.01.1-1
 - Update to 0.01.1
 
-* Wed Nov 1 2006 Stewart Adam <s DOT adam AT diffingo DOT com> 0.01-3
+* Wed Nov 1 2006 Stewart Adam <s.adam AT diffingo DOT com> 0.01-3
 - Bug fixes... Mount point comes before filesystem in /etc/fstab!
 
-* Mon Oct 29 2006 Stewart Adam <s DOT adam AT diffingo DOT com> 0.01-2
+* Mon Oct 29 2006 Stewart Adam <s.adam AT diffingo DOT com> 0.01-2
 - Fix error with comments in fstab
 - Don't quit when there's an error parsing the fstab
 
-* Sat Oct 28 2006 Stewart Adam <s DOT adam AT diffingo DOT com> 0.01-1
+* Sat Oct 28 2006 Stewart Adam <s.adam AT diffingo DOT com> 0.01-1
 - Initial build
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fwfstab/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Nov 2006 13:25:12 -0000	1.2
+++ sources	19 Oct 2007 15:06:20 -0000	1.3
@@ -1 +1 @@
-fb87e760037a9497b1e8f47c8715e65d  fwfstab-0.01.1.tar.gz
+7c7036eae2949d775e63fa2526e0bca7  fwfstab-0.02.tar.gz


