From b1e2b720ceebc214d49e850a79992c3a2f7eba8417682d44d22927e48cc3e586 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 5 Jul 2013 12:29:07 +0000 Subject: [PATCH] Accepting request 182299 from home:dimstar:branches:Base:System Use mozjs-17.0 on openSUSE 13.1 - and do no longer recommend mozjs.. it's auto-detected required OBS-URL: https://build.opensuse.org/request/show/182299 OBS-URL: https://build.opensuse.org/package/show/Base:System/polkit?expand=0&rev=94 --- polkit.changes | 9 +++++++++ polkit.spec | 5 ++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/polkit.changes b/polkit.changes index 145f8c0..24dfd5d 100644 --- a/polkit.changes +++ b/polkit.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Jul 5 11:50:44 UTC 2013 - dimstar@opensuse.org + +- On openSUSE 13.1+, switch from mozjs185 to mozjs-17.0 by: + + Conditionally BuildRequire pkgconfig(mozjs-17.0). +- Drop libmozjs185-1_0 Recommends: the library is actually required + and auto-detected as such by rpm (from 0.111 changes: "The + JavaScript interpreter is now mandatory"). + ------------------------------------------------------------------- Fri Jun 14 20:34:39 UTC 2013 - hrvoje.senjan@gmail.com diff --git a/polkit.spec b/polkit.spec index 7fea18a..6164628 100644 --- a/polkit.spec +++ b/polkit.spec @@ -52,7 +52,11 @@ BuildRequires: pam-devel %if 0%{?with_systemd} BuildRequires: systemd-devel %endif +%if 0%{?suse_version} >= 1310 +BuildRequires: pkgconfig(mozjs-17.0) +%else BuildRequires: pkgconfig(mozjs185) +%endif PreReq: permissions pwdutils %if ! %{with_systemd} Requires: ConsoleKit @@ -62,7 +66,6 @@ Requires: libpolkit0 = %{version}-%{release} %if %{with_systemd} %systemd_requires %endif -Recommends: libmozjs185-1_0 # Upstream First - Policy: # Never add any patches to this package without the upstream commit id