rpms/system-config-services/devel .cvsignore, 1.80, 1.81 sources, 1.93, 1.94 system-config-services.spec, 1.95, 1.96
Nils Philippsen
nphilipp at fedoraproject.org
Tue Aug 25 09:54:58 UTC 2009
Author: nphilipp
Update of /cvs/pkgs/rpms/system-config-services/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1755
Modified Files:
.cvsignore sources system-config-services.spec
Log Message:
version 0.99.36
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/.cvsignore,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- .cvsignore 11 Aug 2009 15:01:38 -0000 1.80
+++ .cvsignore 25 Aug 2009 09:54:57 -0000 1.81
@@ -1 +1 @@
-system-config-services-0.99.35.tar.bz2
+system-config-services-0.99.36.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/sources,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- sources 11 Aug 2009 15:01:38 -0000 1.93
+++ sources 25 Aug 2009 09:54:57 -0000 1.94
@@ -1 +1 @@
-5b3b801a303432ea88f9417d7a347818 system-config-services-0.99.35.tar.bz2
+eea4b6520f036a1bfd9a3acd56912de2 system-config-services-0.99.36.tar.bz2
Index: system-config-services.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/system-config-services.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- system-config-services.spec 11 Aug 2009 15:01:38 -0000 1.95
+++ system-config-services.spec 25 Aug 2009 09:54:57 -0000 1.96
@@ -1,9 +1,17 @@
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")}
%{!?python_version: %global python_version %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()")}
+%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 12 || 0%{?rhel} >= 6
+%bcond_without polkit1
+%endif
+
+%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 11 || 0%{?rhel} >= 6
+%bcond_without polkitauthagent
+%endif
+
Summary: Utility to start and stop system services
Name: system-config-services
-Version: 0.99.35
+Version: 0.99.36
Release: 1%{?dist}
URL: http://fedorahosted.org/%{name}
Source0: http://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.bz2
@@ -26,9 +34,13 @@ Requires: pygtk2-libglade
Requires: python >= 2.3.0
Requires: dbus-python
Requires: python-slip >= 0.1.11
+%if %{with polkit1}
+Requires: python-slip-dbus >= 0.2.0
+%else
Requires: python-slip-dbus >= 0.1.15
+%endif
Requires: python-slip-gtk
-%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
+%if %{with polkitauthagent}
Requires: PolicyKit-authentication-agent
%else
Requires: PolicyKit-gnome
@@ -50,7 +62,13 @@ make %{?_smp_mflags}
%install
rm -rf %{buildroot}
-make DESTDIR=%buildroot install
+make DESTDIR=%buildroot \
+%if %{with polkit1}
+ POLKIT0_SUPPORTED=0 \
+%else
+ POLKIT1_SUPPORTED=0 \
+%endif
+ install
desktop-file-install --vendor system --delete-original \
--dir %{buildroot}%{_datadir}/applications \
@@ -88,11 +106,18 @@ rm -rf %{buildroot}
%{_sysconfdir}/dbus-1/system.d/org.fedoraproject.Config.Services.conf
%{_datadir}/dbus-1/system-services/org.fedoraproject.Config.Services.service
+%if %{with polkit1}
+%{_datadir}/polkit-1/actions/org.fedoraproject.config.services.policy
+%else
%{_datadir}/PolicyKit/policy/org.fedoraproject.config.services.policy
+%endif
%{_mandir}/*/system-config-services.8*
%changelog
+* Tue Aug 25 2009 Nils Philippsen <nils at redhat.com> - 0.99.36-1
+- support PolicyKit 1.0 (#500007)
+
* Tue Aug 11 2009 Nils Philippsen <nils at redhat.com> - 0.99.35-1
- use "chkconfig --type ..." if available (#467871)
More information about the fedora-extras-commits
mailing list