rpms/system-config-services/devel .cvsignore, 1.44, 1.45 sources, 1.54, 1.55 system-config-services.spec, 1.55, 1.56

[Nils Philippsen (nphilipp)]

Author: nphilipp

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	11 Jan 2008 14:00:25 -0000	1.44
+++ .cvsignore	30 Jan 2008 13:44:16 -0000	1.45
@@ -1 +1 @@
-system-config-services-0.9.19.tar.bz2
+system-config-services-0.9.20.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	11 Jan 2008 14:00:25 -0000	1.54
+++ sources	30 Jan 2008 13:44:16 -0000	1.55
@@ -1 +1 @@
-cbc4e5a08c3b3329a3081ab11d9a7cac  system-config-services-0.9.19.tar.bz2
+4cfa07678826d5dedc50243e94ace522  system-config-services-0.9.20.tar.bz2


Index: system-config-services.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/system-config-services.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- system-config-services.spec	11 Jan 2008 14:00:25 -0000	1.55
+++ system-config-services.spec	30 Jan 2008 13:44:16 -0000	1.56
@@ -2,10 +2,10 @@
 
 # Command line configurables
 
-%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 7 || 0%{?rhel} >= 6
-%bcond_without xdg_utils
+%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 8 || 0%{?rhel} >= 6
+%bcond_without rarian_compat
 %else
-%bcond_with xdg_utils
+%bcond_with rarian_compat
 %endif
 
 %if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 9 || 0%{?rhel} >= 6
@@ -16,7 +16,7 @@
 
 Summary: system-config-services is an initscript and xinetd configuration utility
 Name: system-config-services
-Version: 0.9.19
+Version: 0.9.20
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/services
 # We are upstream, thus the source is only available from within this source
@@ -26,28 +26,30 @@
 Group: Applications/System
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: intltool
+BuildRequires: sed
+BuildRequires: desktop-file-utils
+BuildRequires: perl(XML::Parser)
+BuildRequires: gettext
+BuildRequires: gnome-doc-utils
+BuildRequires: docbook-dtds
+%if %{with rarian_compat}
+BuildRequires: rarian-compat
+%else
+BuildRequires: scrollkeeper
+%endif
 Requires: /sbin/chkconfig
 Requires: pygtk2
 Requires: pygtk2-libglade
 Requires: rhpl
-%if 0%{?with_console_util:1}
+%if %{with console_util}
 Requires: usermode >= 1.94
 %else
 Requires: usermode >= 1.36
 %endif
 Requires: usermode-gtk
-%if 0%{?with_xdg_utils:1}
-Requires: xdg-utils
-%else
-Requires: htmlview
-%endif
 Requires: python >= 2.3.0
 Requires: hicolor-icon-theme
-BuildRequires: intltool
-BuildRequires: sed
-BuildRequires: desktop-file-utils
-BuildRequires: perl(XML::Parser)
-BuildRequires: gettext
 Obsoletes: serviceconf <= 0.8.1
 Obsoletes: redhat-config-services <= 0.8.5
 
@@ -90,7 +92,8 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING
-%doc docs/*
+%doc %{_datadir}/omf/system-config-services
+%doc %{_datadir}/gnome/help/system-config-services
 %{_sbindir}/*
 %{_bindir}/*
 %{_datadir}/applications/system-config-services.desktop
@@ -103,6 +106,9 @@
 %{_mandir}/*/system-config-services.8*
 
 %changelog
+* Wed Jan 30 2008 Nils Philippsen <nphilipp at redhat.com> - 0.9.20-1
+- migrate online help to yelp/Docbook XML
+
 * 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)