Author: arekm Date: Wed Jan 20 08:50:42 2010 GMT Module: packages Tag: HEAD ---- Log message: - bcond, untested
---- Files affected: packages/hal: hal.spec (1.183 -> 1.184) ---- Diffs: ================================================================ Index: packages/hal/hal.spec diff -u packages/hal/hal.spec:1.183 packages/hal/hal.spec:1.184 --- packages/hal/hal.spec:1.183 Wed Dec 30 15:24:05 2009 +++ packages/hal/hal.spec Wed Jan 20 09:50:37 2010 @@ -2,12 +2,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 # Summary: HAL - Hardware Abstraction Layer Summary(pl.UTF-8): HAL - abstrakcyjna warstwa dostępu do sprzętu Name: hal Version: 0.5.14 -Release: 4 +Release: 5 License: AFL v2.0 or GPL v2 Group: Libraries Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz @@ -25,7 +26,7 @@ Patch7: %{name}-fixes.patch URL: http://freedesktop.org/Software/hal BuildRequires: ConsoleKit-devel -BuildRequires: PolicyKit-devel >= 0.7 +%{?with_policykit:BuildRequires: PolicyKit-devel >= 0.7} BuildRequires: autoconf >= 2.60 BuildRequires: automake >= 1:1.9 BuildRequires: dbus-glib-devel >= 0.71 @@ -67,8 +68,11 @@ Requires(pre): /usr/sbin/useradd %pyrequires_eq python Requires: %{name}-libs = %{version}-%{release} -#Requires: ConsoleKit +%if %{with policykit} Requires: PolicyKit >= 0.7 +%else +Requires: ConsoleKit +%endif Requires: dbus >= 0.91 Requires: dmidecode >= 2.7 Requires: glib2 >= 1:2.14.0 @@ -167,7 +171,7 @@ --enable-acpi-toshiba \ --enable-console-kit \ --enable-parted \ - --enable-policy-kit \ + %{?with_policykit:--enable-policy-kit} \ --enable-sonypic \ --enable-umount-helper \ --with-cpufreq \ @@ -211,7 +215,7 @@ %pre %groupadd -g 126 -r -f haldaemon %useradd -u 126 -r -d /usr/share/empty -s /bin/false -c "HAL daemon" -g haldaemon haldaemon -/usr/bin/polkit-auth --user haldaemon --grant org.freedesktop.policykit.read 2> /dev/null || : +%{?with_policykit:/usr/bin/polkit-auth --user haldaemon --grant org.freedesktop.policykit.read 2> /dev/null || :} %post @@ -258,7 +262,7 @@ %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/hald %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dbus*/system.d/hal.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/rules.d/90-hal.rules -%config(noreplace) %verify(not md5 mtime size) %{_datadir}/PolicyKit/policy/*.policy +%{?with_policykit:%config(noreplace) %verify(not md5 mtime size) %{_datadir}/PolicyKit/policy/*.policy} %dir %{_datadir}/%{name} %{_datadir}/%{name}/fdi @@ -302,6 +306,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.184 2010/01/20 08:50:37 arekm +- bcond, untested + Revision 1.183 2009/12/30 14:24:05 cactus - add gtkdocize (thx megabajt) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hal/hal.spec?r1=1.183&r2=1.184&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
