rpms/system-config-users/devel .cvsignore, 1.63, 1.64 sources, 1.70, 1.71 system-config-users.spec, 1.74, 1.75

[Nils Philippsen (nphilipp)]

Author: nphilipp

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

Modified Files:
	.cvsignore sources system-config-users.spec 
Log Message:
migrate online help to yelp/Docbook XML



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- .cvsignore	11 Jan 2008 14:12:30 -0000	1.63
+++ .cvsignore	31 Jan 2008 13:39:18 -0000	1.64
@@ -1 +1 @@
-system-config-users-1.2.75.tar.bz2
+system-config-users-1.2.76.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- sources	11 Jan 2008 14:12:30 -0000	1.70
+++ sources	31 Jan 2008 13:39:18 -0000	1.71
@@ -1 +1 @@
-08b796e5e445ecd656756f27b8daaaef  system-config-users-1.2.75.tar.bz2
+107b1d847ced559fe06236775dcfcd05  system-config-users-1.2.76.tar.bz2


Index: system-config-users.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/system-config-users.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- system-config-users.spec	11 Jan 2008 14:12:30 -0000	1.74
+++ system-config-users.spec	31 Jan 2008 13:39:18 -0000	1.75
@@ -1,5 +1,11 @@
 # Command line configurables
 
+%if 0%{?fedora}%{?redhat} == 0 || 0%{?fedora} >= 5 || 0%{?redhat} >= 5
+%bcond_without cracklib
+%else
+%bcond_with cracklib
+%endif
+
 %if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 7 || 0%{?rhel} >= 6
 %bcond_without xdg_utils
 %bcond_without cracklib-python
@@ -10,8 +16,10 @@
 
 %if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 8 || 0%{?rhel} >= 6
 %bcond_without libuser_python
+%bcond_without rarian_compat
 %else
 %bcond_with libuser_python
+%bcond_with rarian_compat
 %endif
 
 %if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 9 || 0%{?rhel} >= 6
@@ -22,7 +30,7 @@
 
 Summary: A graphical interface for administering users and groups
 Name: system-config-users
-Version: 1.2.75
+Version: 1.2.76
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/users
 License: GPLv2+
@@ -36,8 +44,15 @@
 BuildRequires: gettext
 BuildRequires: intltool
 BuildRequires: findutils
+BuildRequires: gnome-doc-utils
+BuildRequires: docbook-dtds
+%if %{with rarian_compat}
+BuildRequires: rarian-compat
+%else
+BuildRequires: scrollkeeper
+%endif
 Obsoletes: redhat-config-users <= 1.2.4
-%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 8 || 0%{?rhel} >= 6
+%if %{with libuser_python}
 Requires: libuser-python >= 0.56
 %else
 Requires: libuser >= 0.56
@@ -45,12 +60,12 @@
 Requires: python >= 2.0
 Requires: pygtk2 >= 2.6
 Requires: pygtk2-libglade
-%if 0%{?with_console_util:1}
+%if %{with console_util}
 Requires: usermode >= 1.94
 %else
 Requires: usermode >= 1.36
 %endif
-%if %{?with_xdg_utils:1}
+%if %{with xdg_utils}
 Requires: xdg-utils
 %else
 Requires: htmlview
@@ -59,8 +74,8 @@
 Requires: /usr/bin/pgrep
 Requires: rhpl
 Requires: hicolor-icon-theme
-%if 0%{?fedora}%{?redhat} == 0 || 0%{?fedora} >= 5 || 0%{?redhat} >= 5
-%if 0%{?with_cracklib_python:1}
+%if %{with cracklib}
+%if %{with cracklib_python}
 Requires: cracklib-python
 %else
 Requires: cracklib >= 2.8.6
@@ -109,7 +124,8 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING
-%doc doc/*
+%doc %{_datadir}/omf/system-config-users
+%doc %{_datadir}/gnome/help/system-config-users
 %{_bindir}/system-config-users
 %{_datadir}/system-config-users
 %{_mandir}/man8/system-config-users*
@@ -120,6 +136,9 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/system-config-users
 
 %changelog
+* Thu Jan 31 2008 Nils Philippsen <nphilipp at redhat.com> - 1.2.76-1
+- migrate online help to yelp/Docbook XML
+
 * 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)