rpms/system-config-users/devel .cvsignore, 1.62, 1.63 sources, 1.69, 1.70 system-config-users.spec, 1.73, 1.74

[Nils Philippsen (nphilipp)]

Author: nphilipp

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- .cvsignore	27 Dec 2007 13:40:56 -0000	1.62
+++ .cvsignore	11 Jan 2008 14:12:30 -0000	1.63
@@ -1 +1 @@
-system-config-users-1.2.74.tar.bz2
+system-config-users-1.2.75.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sources	27 Dec 2007 13:40:56 -0000	1.69
+++ sources	11 Jan 2008 14:12:30 -0000	1.70
@@ -1 +1 @@
-8554ed723e2dd6f0fab966e46357b30b  system-config-users-1.2.74.tar.bz2
+08b796e5e445ecd656756f27b8daaaef  system-config-users-1.2.75.tar.bz2


Index: system-config-users.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/system-config-users.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- system-config-users.spec	27 Dec 2007 13:40:56 -0000	1.73
+++ system-config-users.spec	11 Jan 2008 14:12:30 -0000	1.74
@@ -1,6 +1,28 @@
+# Command line configurables
+
+%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 7 || 0%{?rhel} >= 6
+%bcond_without xdg_utils
+%bcond_without cracklib-python
+%else
+%bcond_with xdg_utils
+%bcond_with cracklib-python
+%endif
+
+%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 8 || 0%{?rhel} >= 6
+%bcond_without libuser_python
+%else
+%bcond_with libuser_python
+%endif
+
+%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 9 || 0%{?rhel} >= 6
+%bcond_without console_util
+%else
+%bcond_with console_util
+%endif
+
 Summary: A graphical interface for administering users and groups
 Name: system-config-users
-Version: 1.2.74
+Version: 1.2.75
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/users
 License: GPLv2+
@@ -23,8 +45,12 @@
 Requires: python >= 2.0
 Requires: pygtk2 >= 2.6
 Requires: pygtk2-libglade
+%if 0%{?with_console_util:1}
+Requires: usermode >= 1.94
+%else
 Requires: usermode >= 1.36
-%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 7 || 0%{?rhel} >= 6
+%endif
+%if %{?with_xdg_utils:1}
 Requires: xdg-utils
 %else
 Requires: htmlview
@@ -33,10 +59,10 @@
 Requires: /usr/bin/pgrep
 Requires: rhpl
 Requires: hicolor-icon-theme
-%if 0%{?fedora} >= 7 || 0%{?redhat} >= 6
+%if 0%{?fedora}%{?redhat} == 0 || 0%{?fedora} >= 5 || 0%{?redhat} >= 5
+%if 0%{?with_cracklib_python:1}
 Requires: cracklib-python
 %else
-%if 0%{?fedora} >= 5 || 0%{?redhat} >= 5
 Requires: cracklib >= 2.8.6
 %endif
 %endif
@@ -51,7 +77,7 @@
 %setup -q
 
 %build
-make %{?_smp_mflags}
+make %{?with_console_util:CONSOLE_USE_CONFIG_UTIL=1} %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -94,6 +120,9 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/system-config-users
 
 %changelog
+* Fri Jan 11 2008 Nils Philippsen <nphilipp at redhat.com> - 1.2.75-1
+- use config-util for userhelper configuration from Fedora 9 on (#428403)
+
 * Thu Dec 27 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.74-1
 - rename sr at Latn to sr at latin (#426592)