rpms/system-config-nfs/F-7 .cvsignore, 1.32, 1.33 sources, 1.35, 1.36 system-config-nfs.spec, 1.39, 1.40

[Nils Philippsen (nphilipp)]

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-nfs/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1083

Modified Files:
	.cvsignore sources system-config-nfs.spec 
Log Message:
use rpcbind service if portmap isn't available
fix some typos
avoid traceback when neither xdg-open nor htmlview is found
remove obsolete no.po translation file (#332481)
don't let gtk-update-icon-cache fail scriptlets
Merge review (#226465):
- remove duplicate file from %files
- re-add plain hicolor-icon-theme requirement to avoid unowned directories
- remove exports.py
- remove "ExclusiveOS: Linux"
- remove hicolor-icon-theme requirement, call gtk-update-icon-cache with full path
- use xdg-open if available
- obsolete explicit version of redhat-config-nfs
- change license tag to GPLv2+
- add release tags to changelog entries to appease rpmlint
- install most python files not as executable
- use %config(noreplace)
add "make diff" ("dif") and "make shortdiff" ("sdif")
pick up updated translations
make use of force tagging (since mercurial 0.9.4)
make "make archive" work with Hg
remove bogus gtk.FileSelection instantiation (spotted by Adel Gadllah)
fix desktop file category (#245889)
mark dummy dialog title as non-translatable, use xgettext directly on glade files instead of gladestrings file (#238409)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-nfs/F-7/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	25 Apr 2007 12:00:49 -0000	1.32
+++ .cvsignore	16 Nov 2007 08:45:42 -0000	1.33
@@ -1 +1 @@
-system-config-nfs-1.3.25.tar.bz2
+system-config-nfs-1.3.33.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-nfs/F-7/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	25 Apr 2007 12:00:49 -0000	1.35
+++ sources	16 Nov 2007 08:45:42 -0000	1.36
@@ -1 +1 @@
-df9fbef6b1da57d1850d7e697b80d923  system-config-nfs-1.3.25.tar.bz2
+785e7f2193d00159d7740fff6657ba9f  system-config-nfs-1.3.33.tar.bz2


Index: system-config-nfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-nfs/F-7/system-config-nfs.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- system-config-nfs.spec	25 Apr 2007 12:00:49 -0000	1.39
+++ system-config-nfs.spec	16 Nov 2007 08:45:42 -0000	1.40
@@ -1,10 +1,9 @@
 Summary: NFS server configuration tool
 Name: system-config-nfs
-Version: 1.3.25
+Version: 1.3.33
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/nfs
-License: GPL
-ExclusiveOS: Linux
+License: GPLv2+
 Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -15,16 +14,19 @@
 BuildRequires: gettext
 BuildRequires: intltool
 BuildRequires: python
-Obsoletes: redhat-config-nfs
+Obsoletes: redhat-config-nfs < 1.1.4
 Requires: pygtk2
 Requires: pygtk2-libglade
 Requires: python >= 2.0
 Requires: nfs-utils
 Requires: usermode >= 1.36
 Requires: rhpl
+%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 7 || 0%{?rhel} >= 6
+Requires: xdg-utils
+%else
 Requires: htmlview
-Requires(post): hicolor-icon-theme
-Requires(postun): hicolor-icon-theme
+%endif
+Requires: hicolor-icon-theme
 
 %description
 system-config-nfs is a graphical user interface for creating, 
@@ -53,30 +55,81 @@
 
 %post
 touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
 %postun
 touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYING
 %doc doc/*
 %{_bindir}/system-config-nfs
 %{_datadir}/system-config-nfs
-%attr(0644,root,root) %{_datadir}/applications/system-config-nfs.desktop
-%attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-nfs.png
-%attr(0644,root,root) %{_datadir}/%{name}/pixmaps/system-config-nfs.png
-%attr(0644,root,root) %config /etc/security/console.apps/system-config-nfs
-%attr(0644,root,root) %config /etc/pam.d/system-config-nfs
+%{_datadir}/applications/system-config-nfs.desktop
+%{_datadir}/icons/hicolor/48x48/apps/system-config-nfs.png
+%config(noreplace) %{_sysconfdir}/security/console.apps/system-config-nfs
+%config(noreplace) %{_sysconfdir}/pam.d/system-config-nfs
 
 %changelog
-* Wed Apr 25 2007 Nils Philippsen <nphilipp at redhat.com> 1.3.25
+* Fri Nov 16 2007 Nils Philippsen <nphilipp at redhat.com> 1.3.33-1
+- use rpcbind service if portmap isn't available
+
+* Mon Oct 15 2007 Nils Philippsen <nphilipp at redhat.com> 1.3.32-1
+- fix some typos
+- avoid traceback when neither xdg-open nor htmlview is found
+
+* Mon Oct 15 2007 Nils Philippsen <nphilipp at redhat.com> 1.3.31-1
+- Merge review (#226465):
+  - remove duplicate file from %%files
+  - re-add plain hicolor-icon-theme requirement to avoid unowned directories
+- remove obsolete no.po translation file (#332481)
+- don't let gtk-update-icon-cache fail scriptlets
+
+* Mon Oct 15 2007 Nils Philippsen <nphilipp at redhat.com> 1.3.30-1
+- Merge review (#226465):
+  - remove exports.py
+  - remove "ExclusiveOS: Linux"
+  - remove hicolor-icon-theme requirement, call gtk-update-icon-cache with full
+    path
+
+* Thu Oct 11 2007 Nils Philippsen <nphilipp at redhat.com> 1.3.29-1
+- Merge review (#226465):
+  - use xdg-open if available
+  - obsolete explicit version of redhat-config-nfs
+  - change license tag to GPLv2+
+  - add release tags to changelog entries to appease rpmlint
+  - install most python files not as executable
+  - use %%config(noreplace)
+
+* Mon Oct 08 2007 Nils Philippsen <nphilipp at redhat.com>
+- add "make diff" ("dif") and "make shortdiff" ("sdif")
+
+* Tue Oct 02 2007 Nils Philippsen <nphilipp at redhat.com> 1.3.28-1
+- pick up updated translations
+
+* Mon Sep 10 2007 Nils Philippsen <nphilipp at redhat.com>
+- make use of force tagging (since mercurial 0.9.4)
+
+* Mon Jul 23 2007 Nils Philippsen <nphilipp at redhat.com> 1.3.27-1
+- make "make archive" work with Hg
+
+* Wed Jun 27 2007 Nils Philippsen <nphilipp at redhat.com>
+- remove bogus gtk.FileSelection instantiation (spotted by Adel Gadllah)
+
+* Wed Jun 27 2007 Nils Philippsen <nphilipp at redhat.com> 1.3.26-1
+- fix desktop file category (#245889)
+
+* Mon Apr 30 2007 Nils Philippsen <nphilipp at redhat.com>
+- mark dummy dialog title as non-translatable, use xgettext directly on glade
+  files instead of gladestrings file (#238409)
+
+* Wed Apr 25 2007 Nils Philippsen <nphilipp at redhat.com> 1.3.25-1
 - pick up updated language files
 
 * Thu Mar 22 2007 Nils Philippsen <nphilipp at redhat.com>
@@ -89,19 +142,19 @@
 - fix licensing blurb in PO files
 - require python >= 2.0 instead of python2
 
-* Thu Feb 08 2007 Nils Philippsen <nphilipp at redhat.com> 1.3.24
+* Thu Feb 08 2007 Nils Philippsen <nphilipp at redhat.com> 1.3.24-1
 - pick up updated translations
 
 * Wed Dec 13 2006 Nils Philippsen <nphilipp at redhat.com>
 - require pygtk2-libglade (#197624)
 
-* Tue Dec 12 2006 Nils Philippsen <nphilipp at redhat.com> 1.3.23
+* Tue Dec 12 2006 Nils Philippsen <nphilipp at redhat.com> 1.3.23-1
 - pick up updated translations (#198604, #216608)
 
-* Fri Nov 24 2006 Nils Philippsen <nphilipp at redhat.com> 1.3.22
+* Fri Nov 24 2006 Nils Philippsen <nphilipp at redhat.com> 1.3.22-1
 - pick up updated translations (#216608)
 
-* Fri Nov 10 2006 Nils Philippsen <nphilipp at redhat.com> 1.3.21
+* Fri Nov 10 2006 Nils Philippsen <nphilipp at redhat.com> 1.3.21-1
 - don't apply string-escape decoder on /etc/exports
 - add dist tag
 
@@ -112,37 +165,37 @@
 * Wed Nov 08 2006 Nils Philippsen <nphilipp at redhat.com>
 - begin to understand multilines (#214163)
 
-* Fri Mar 03 2006 Nils Philippsen <nphilipp at redhat.com> 1.3.19
+* Fri Mar 03 2006 Nils Philippsen <nphilipp at redhat.com> 1.3.19-1
 - require hicolor-icon-theme (#182870, #182871)
 
-* Thu Feb 02 2006 Nils Philippsen <nphilipp at redhat.com> 1.3.18
+* Thu Feb 02 2006 Nils Philippsen <nphilipp at redhat.com> 1.3.18-1
 - don't complain when trying to edit a share (#179687)
 - handle wildcards in warning messages for duplicates
 
-* Wed Feb 01 2006 Nils Philippsen <nphilipp at redhat.com> 1.3.17
+* Wed Feb 01 2006 Nils Philippsen <nphilipp at redhat.com> 1.3.17-1
 - reset properties dialog before being shown for the first time
 
-* Mon Jan 30 2006 Nils Philippsen <nphilipp at redhat.com> 1.3.16
+* Mon Jan 30 2006 Nils Philippsen <nphilipp at redhat.com> 1.3.16-1
 - avoid exporting a share more than once to a specific client
 - allow exporting a share with different settings for different clients
   (#178830)
 
-* Fri Dec 16 2005 Nils Philippsen <nphilipp at redhat.com> 1.3.15
+* Fri Dec 16 2005 Nils Philippsen <nphilipp at redhat.com> 1.3.15-1
 - don't apply server settings (non-)changes on Cancel
 - make server settings dialog actually show all text entries
 
-* Fri Dec 16 2005 Nils Philippsen <nphilipp at redhat.com> 1.3.14
+* Fri Dec 16 2005 Nils Philippsen <nphilipp at redhat.com> 1.3.14-1
 - translate permissions column (#175921, patch by Frank Arnold)
 
 * Fri Oct 14 2005 Nils Philippsen <nphilipp at redhat.com>
 - don't use pam_stack (#170637)
 
-* Thu Oct 13 2005 Nils Philippsen <nphilipp at redhat.com> 1.3.13
+* Thu Oct 13 2005 Nils Philippsen <nphilipp at redhat.com> 1.3.13-1
 - include missing files (spotted by Bernardo Innocenti), remove unneeded test
   and sample files
 - don't remove byte-compiled files anymore
 
-* Tue Oct 11 2005 Nils Philippsen <nphilipp at redhat.com> 1.3.12
+* Tue Oct 11 2005 Nils Philippsen <nphilipp at redhat.com> 1.3.12-1
 - allow user to set networking ports to be used (#151166)
 - separate code concerning the NFS server, its settings and NFS exports
 - some code cleanup
@@ -153,22 +206,22 @@
 * Fri Aug 12 2005 Nils Philippsen <nphilipp at redhat.com>
 - use GtkFileChooser instead of GtkFileSelection (#165768)
 
-* Thu Jul 07 2005 Nils Philippsen <nphilipp at redhat.com> 1.3.11
+* Thu Jul 07 2005 Nils Philippsen <nphilipp at redhat.com> 1.3.11-1
 - display permissions correctly in list (#162437)
 - use symbolic names when dealing with list columns
 - edit entry when double-clicking on it
 
-* Mon May 09 2005 Nils Philippsen <nphilipp at redhat.com> 1.3.10
+* Mon May 09 2005 Nils Philippsen <nphilipp at redhat.com> 1.3.10-1
 - pick up updated translations
 
-* Fri May 06 2005 Nils Philippsen <nphilipp at redhat.com> 1.3.9
+* Fri May 06 2005 Nils Philippsen <nphilipp at redhat.com> 1.3.9-1
 - make desktop file rebuild consistently
 
-* Fri May 06 2005 Nils Philippsen <nphilipp at redhat.com> 1.3.8
+* Fri May 06 2005 Nils Philippsen <nphilipp at redhat.com> 1.3.8-1
 - make desktop file translatable (#156796)
 - use DESTDIR consistently (#156786)
 
-* Thu Apr 28 2005 Nils Philippsen <nphilipp at redhat.com> 1.3.7
+* Thu Apr 28 2005 Nils Philippsen <nphilipp at redhat.com> 1.3.7-1
 - don't include dangling /usr/bin/nfs-export symlink
 
 * Wed Apr 27 2005 Jeremy Katz <katzj at redhat.com> 1.3.6-2
@@ -382,7 +435,7 @@
 - Require python2 instead of python
 - Increase version number
 
-* Tue Jun 18 2002 Brent Fox <bfox at redhat.com> 0.2.1
+* Tue Jun 18 2002 Brent Fox <bfox at redhat.com> 0.2.1-1
 - Added copyright data to Python files
 
 * Thu May 30 2002 Brent Fox <bfox at redhat.com> 0.1.0-4