rpms/system-config-services/devel .cvsignore, 1.43, 1.44 sources, 1.53, 1.54 system-config-services.spec, 1.54, 1.55

[Nils Philippsen (nphilipp)]

Author: nphilipp

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore	27 Dec 2007 12:48:52 -0000	1.43
+++ .cvsignore	11 Jan 2008 14:00:25 -0000	1.44
@@ -1 +1 @@
-system-config-services-0.9.18.tar.bz2
+system-config-services-0.9.19.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources	27 Dec 2007 12:48:52 -0000	1.53
+++ sources	11 Jan 2008 14:00:25 -0000	1.54
@@ -1 +1 @@
-2824c6087316fce84ff602cf35c5e14e  system-config-services-0.9.18.tar.bz2
+cbc4e5a08c3b3329a3081ab11d9a7cac  system-config-services-0.9.19.tar.bz2


Index: system-config-services.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/system-config-services.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- system-config-services.spec	27 Dec 2007 12:48:52 -0000	1.54
+++ system-config-services.spec	11 Jan 2008 14:00:25 -0000	1.55
@@ -1,7 +1,22 @@
 # -*- RPM-SPEC -*-
+
+# 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: system-config-services is an initscript and xinetd configuration utility
 Name: system-config-services
-Version: 0.9.18
+Version: 0.9.19
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/services
 # We are upstream, thus the source is only available from within this source
@@ -15,9 +30,13 @@
 Requires: pygtk2
 Requires: pygtk2-libglade
 Requires: rhpl
+%if 0%{?with_console_util:1}
+Requires: usermode >= 1.94
+%else
 Requires: usermode >= 1.36
+%endif
 Requires: usermode-gtk
-%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 7 || 0%{?rhel} >= 6
+%if 0%{?with_xdg_utils:1}
 Requires: xdg-utils
 %else
 Requires: htmlview
@@ -40,7 +59,7 @@
 %setup -q
 
 %build
-make %{?_smp_mflags}
+make %{?with_console_util:CONSOLE_USE_CONFIG_UTIL=1} %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -84,6 +103,9 @@
 %{_mandir}/*/system-config-services.8*
 
 %changelog
+* Fri Jan 11 2008 Nils Philippsen <nphilipp at redhat.com> - 0.9.19-1
+- use config-util for userhelper configuration from Fedora 9 on (#428407)
+
 * Thu Dec 27 2007 Nils Philippsen <nphilipp at redhat.com> - 0.9.18-1
 - rename sr at Latn to sr at latin (#426590)