rpms/system-config-services/devel .cvsignore, 1.90, 1.91 sources, 1.103, 1.104 system-config-services.spec, 1.105, 1.106

[Nils Philippsen]

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-services/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3325

Modified Files:
	.cvsignore sources system-config-services.spec 
Log Message:
version 0.99.46


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/.cvsignore,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- .cvsignore	22 Jun 2010 13:24:30 -0000	1.90
+++ .cvsignore	30 Jun 2010 11:24:14 -0000	1.91
@@ -1 +1 @@
-system-config-services-0.99.45.tar.bz2
+system-config-services-0.99.46.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/sources,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- sources	22 Jun 2010 13:24:30 -0000	1.103
+++ sources	30 Jun 2010 11:24:14 -0000	1.104
@@ -1 +1 @@
-4fa00f6e748382815093514f4e1fea37  system-config-services-0.99.45.tar.bz2
+0b6958e65092217bf73ddfe3e61e8eb2  system-config-services-0.99.46.tar.bz2


Index: system-config-services.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/system-config-services.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- system-config-services.spec	22 Jun 2010 13:24:30 -0000	1.105
+++ system-config-services.spec	30 Jun 2010 11:24:14 -0000	1.106
@@ -5,9 +5,16 @@
 %bcond_without polkit1
 %endif
 
+# Enterprise versions pull in docs automatically
+%if 0%{?rhel} > 0
+%bcond_without require_docs
+%else
+%bcond_with require_docs
+%endif
+
 Summary: Utility to start and stop system services
 Name: system-config-services
-Version: 0.99.45
+Version: 0.99.46
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 Source0: http://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.bz2
@@ -37,6 +44,9 @@ Requires: python-slip-gtk
 # package system-config-services-docs. The following ensures that updating from
 # earlier versions gives you both the main package and documentation.
 Obsoletes: system-config-services < 0.99.29
+%if %{with require_docs}
+Requires: system-config-services-docs
+%endif
 
 %description
 system-config-services is a utility which allows you to configure which
@@ -103,6 +113,13 @@ rm -rf %{buildroot}
 %{_mandir}/*/system-config-services.8*
 
 %changelog
+* Wed Jun 30 2010 Nils Philippsen <nils at redhat.com> - 0.99.46-1
+- require docs in enterprise builds
+
+* Fri Jun 25 2010 Nils Philippsen <nils at redhat.com>
+- don't needlessly trigger xinetd reloads (#583842)
+- make icon themeable
+
 * Tue Jun 22 2010 Nils Philippsen <nils at redhat.com> - 0.99.45-1
 - pick up translation updates