diff --git a/.cvsignore b/.cvsignore index 13a792c..da0322f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -system-config-services-0.99.45.tar.bz2 +system-config-services-0.99.46.tar.bz2 diff --git a/sources b/sources index 446010d..fceac6a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4fa00f6e748382815093514f4e1fea37 system-config-services-0.99.45.tar.bz2 +0b6958e65092217bf73ddfe3e61e8eb2 system-config-services-0.99.46.tar.bz2 diff --git a/system-config-services.spec b/system-config-services.spec index ff7cb1f..850a4dc 100644 --- a/system-config-services.spec +++ b/system-config-services.spec @@ -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 - 0.99.46-1 +- require docs in enterprise builds + +* Fri Jun 25 2010 Nils Philippsen +- don't needlessly trigger xinetd reloads (#583842) +- make icon themeable + * Tue Jun 22 2010 Nils Philippsen - 0.99.45-1 - pick up translation updates