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

[Nils Philippsen (nphilipp)]

Author: nphilipp

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore	11 Jan 2008 13:47:07 -0000	1.54
+++ .cvsignore	29 Jan 2008 16:33:32 -0000	1.55
@@ -1 +1 @@
-system-config-samba-1.2.60.tar.bz2
+system-config-samba-1.2.61.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	11 Jan 2008 13:47:07 -0000	1.56
+++ sources	29 Jan 2008 16:33:32 -0000	1.57
@@ -1 +1 @@
-e1164b994f9029c04678705ad0cd2ba0  system-config-samba-1.2.60.tar.bz2
+91bc66b3c52fbcedfa531173089ec345  system-config-samba-1.2.61.tar.bz2


Index: system-config-samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/system-config-samba.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- system-config-samba.spec	11 Jan 2008 13:47:07 -0000	1.59
+++ system-config-samba.spec	29 Jan 2008 16:33:32 -0000	1.60
@@ -1,11 +1,5 @@
 # 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
@@ -18,9 +12,15 @@
 %bcond_with console_util
 %endif
 
+%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 8 || 0%{?rhel} >= 6
+%bcond_without rarian_compat
+%else
+%bcond_with rarian_compat
+%endif
+
 Summary: Samba server configuration tool
 Name: system-config-samba
-Version: 1.2.60
+Version: 1.2.61
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/samba
 License: GPLv2+
@@ -33,6 +33,13 @@
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: intltool
+BuildRequires: gnome-doc-utils
+BuildRequires: docbook-dtds
+%if %{with rarian_compat}
+BuildRequires: rarian-compat
+%else
+BuildRequires: scrollkeeper
+%endif
 Obsoletes: redhat-config-samba < 1.1.5
 Requires: pygtk2
 Requires: pygtk2-libglade
@@ -49,11 +56,6 @@
 %else
 Requires: libuser
 %endif
-%if 0%{?with_xdg_utils:1}
-Requires: xdg-utils
-%else
-Requires: htmlview
-%endif
 Requires: hicolor-icon-theme
 
 %description
@@ -97,7 +99,8 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING
-%doc doc/*
+%doc %{_datadir}/omf/system-config-samba
+%doc %{_datadir}/gnome/help/system-config-samba
 %{_bindir}/system-config-samba
 %{_datadir}/system-config-samba
 %{_datadir}/applications/system-config-samba.desktop
@@ -106,6 +109,9 @@
 %config(noreplace) %{_sysconfdir}/pam.d/system-config-samba
 
 %changelog
+* Tue Jan 29 2008 Nils Philippsen <nphilipp at redhat.com> - 1.2.61-1
+- migrate online help to yelp/Docbook XML
+
 * 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)