packages: hal/hal.spec - rel 6; drop consolekit too

[arekm]

Author: arekm                        Date: Thu May 13 10:46:16 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 6; drop consolekit too

---- Files affected:
packages/hal:
   hal.spec (1.185 -> 1.186) 

---- Diffs:

================================================================
Index: packages/hal/hal.spec
diff -u packages/hal/hal.spec:1.185 packages/hal/hal.spec:1.186
--- packages/hal/hal.spec:1.185	Wed Jan 20 12:57:40 2010
+++ packages/hal/hal.spec	Thu May 13 12:46:11 2010
@@ -3,12 +3,13 @@
 # Conditional build:
 %bcond_without	doc		# disable documentation building
 %bcond_with	policykit	# http://lists.pld-linux.org/mailman/pipermail/pld-devel-pl/2010-January/150972.html
+%bcond_with	consolekit
 #
 Summary:	HAL - Hardware Abstraction Layer
 Summary(pl.UTF-8):	HAL - abstrakcyjna warstwa dostępu do sprzętu
 Name:		hal
 Version:	0.5.14
-Release:	5
+Release:	6
 License:	AFL v2.0 or GPL v2
 Group:		Libraries
 Source0:	http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
@@ -25,7 +26,7 @@
 Patch6:		%{name}-out.patch
 Patch7:		%{name}-fixes.patch
 URL:		http://freedesktop.org/Software/hal
-BuildRequires:	ConsoleKit-devel
+%{?with_consolekit:BuildRequires:	ConsoleKit-devel}
 %{?with_policykit:BuildRequires:	PolicyKit-devel >= 0.7}
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake >= 1:1.9
@@ -71,8 +72,10 @@
 %if %{with policykit}
 Requires:	PolicyKit >= 0.7
 %else
+%if %{with consolekit}
 Requires:	ConsoleKit
 %endif
+%endif
 Requires:	dbus >= 0.91
 Requires:	dmidecode >= 2.7
 Requires:	glib2 >= 1:2.14.0
@@ -170,7 +173,7 @@
 	%{?with_policykit:--enable-acl-management} \
 	--enable-acpi-ibm \
 	--enable-acpi-toshiba \
-	--enable-console-kit \
+	--%{?!with_consolekit:dis}%{?with_consolekit:en}able-console-kit \
 	--enable-parted \
 	--%{?!with_policykit:dis}%{?with_policykit:en}able-policy-kit \
 	--enable-sonypic \
@@ -307,6 +310,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.186  2010/05/13 10:46:11  arekm
+- rel 6; drop consolekit too
+
 Revision 1.185  2010/01/20 11:57:40  arekm
 - builds now, disable policykit for testing
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hal/hal.spec?r1=1.185&r2=1.186&f=u