rpms/system-config-nfs/devel .cvsignore, 1.41, 1.42 sources, 1.46, 1.47 system-config-nfs.spec, 1.50, 1.51

[Nils Philippsen (nphilipp)]

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-nfs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31152

Modified Files:
	.cvsignore sources system-config-nfs.spec 
Log Message:
use config-util for userhelper configuration from Fedora 9 on (#428399)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-nfs/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	27 Dec 2007 12:39:19 -0000	1.41
+++ .cvsignore	11 Jan 2008 13:30:40 -0000	1.42
@@ -1 +1 @@
-system-config-nfs-1.3.34.tar.bz2
+system-config-nfs-1.3.35.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-nfs/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	27 Dec 2007 12:39:19 -0000	1.46
+++ sources	11 Jan 2008 13:30:40 -0000	1.47
@@ -1 +1 @@
-06346afe70e4cc6289fa682c9f9da456  system-config-nfs-1.3.34.tar.bz2
+05499ee20f2ec78fc98f5db4fe661240  system-config-nfs-1.3.35.tar.bz2


Index: system-config-nfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-nfs/devel/system-config-nfs.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- system-config-nfs.spec	27 Dec 2007 12:39:19 -0000	1.50
+++ system-config-nfs.spec	11 Jan 2008 13:30:40 -0000	1.51
@@ -1,6 +1,20 @@
+# Command line configurables
+
+%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 7 || 0%{?rhel} >= 6
+%bcond_without xdg_utils
+%else
+%bcond_with xdg_utils
+%endif
+
+%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 9 || 0%{?rhel} >= 6
+%bcond_without console_util
+%else
+%bcond_with console_util
+%endif
+
 Summary: NFS server configuration tool
 Name: system-config-nfs
-Version: 1.3.34
+Version: 1.3.35
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/nfs
 License: GPLv2+
@@ -19,9 +33,13 @@
 Requires: pygtk2-libglade
 Requires: python >= 2.0
 Requires: nfs-utils
+%if 0%{?with_console_util:1}
+Requires: usermode >= 1.94
+%else
 Requires: usermode >= 1.36
+%endif
 Requires: rhpl
-%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 7 || 0%{?rhel} >= 6
+%if 0%{?with_xdg_utils:1}
 Requires: xdg-utils
 %else
 Requires: htmlview
@@ -36,7 +54,7 @@
 %setup -q
 
 %build
-make %{?_smp_mflags}
+make %{?with_console_util:CONSOLE_USE_CONFIG_UTIL=1} %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -77,6 +95,9 @@
 %config(noreplace) %{_sysconfdir}/pam.d/system-config-nfs
 
 %changelog
+* Fri Jan 11 2008 Nils Philippsen <nphilipp at redhat.com> - 1.3.35-1
+- use config-util for userhelper configuration from Fedora 9 on (#428399)
+
 * Thu Dec 27 2007 Nils Philippsen <nphilipp at redhat.com> - 1.3.34-1
 - rename sr at Latn to sr at latin (#426589)