rpms/system-config-samba/devel .cvsignore, 1.53, 1.54 sources, 1.55, 1.56 system-config-samba.spec, 1.58, 1.59

[Nils Philippsen (nphilipp)]

Author: nphilipp

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	27 Dec 2007 12:45:30 -0000	1.53
+++ .cvsignore	11 Jan 2008 13:47:07 -0000	1.54
@@ -1 +1 @@
-system-config-samba-1.2.59.tar.bz2
+system-config-samba-1.2.60.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	27 Dec 2007 12:45:30 -0000	1.55
+++ sources	11 Jan 2008 13:47:07 -0000	1.56
@@ -1 +1 @@
-75328c2395e76ddbd2725eef1df7295d  system-config-samba-1.2.59.tar.bz2
+e1164b994f9029c04678705ad0cd2ba0  system-config-samba-1.2.60.tar.bz2


Index: system-config-samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/system-config-samba.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- system-config-samba.spec	27 Dec 2007 12:45:30 -0000	1.58
+++ system-config-samba.spec	11 Jan 2008 13:47:07 -0000	1.59
@@ -1,6 +1,26 @@
+# 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} >= 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: Samba server configuration tool
 Name: system-config-samba
-Version: 1.2.59
+Version: 1.2.60
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/samba
 License: GPLv2+
@@ -17,15 +37,19 @@
 Requires: pygtk2
 Requires: pygtk2-libglade
 Requires: python
+%if 0%{?with_console_util:1}
+Requires: usermode >= 1.94
+%else
 Requires: usermode >= 1.36
+%endif
 Requires: samba
 Requires: samba-common
-%if 0%{?fedora} >= 8 || 0%{?rhel} >= 6
+%if 0%{?with_libuser_python:1}
 Requires: libuser-python
 %else
 Requires: libuser
 %endif
-%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 +64,7 @@
 %setup -q
 
 %build
-make %{?_smp_mflags}
+make %{?with_console_util:CONSOLE_USE_CONFIG_UTIL=1} %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -82,6 +106,9 @@
 %config(noreplace) %{_sysconfdir}/pam.d/system-config-samba
 
 %changelog
+* Fri Jan 11 2008 Nils Philippsen <nphilipp at redhat.com> - 1.2.60-1
+- use config-util for userhelper configuration from Fedora 9 on (#428393)
+
 * Thu Dec 27 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.59-1
 - rename sr at Latn to sr at latin (#426588)