Accepting request 148545 from Base:System

Update to 0.110: minor update, that includes our patches + a small fix for XAUTHORITY that is nice to have

OBS-URL: https://build.opensuse.org/request/show/148545
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/polkit?expand=0&rev=42

polkit-0.108.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2877c15f56abe43609f6ece54ee0bfea169ca6d7b271b17296b14d751eab23a6
-size 1389367

polkit-0.110.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8e5c5044bb968643b7fa379f287fb10582615df760ad2f1cb84be6e19fafe6e8
+size 1390215

polkit-libmozjs.patch

@@ -1,28 +0,0 @@
-From a6747362693a91f8cfa3bd5e619cf91e2e03941b Mon Sep 17 00:00:00 2001
-From: David Zeuthen <zeuthen@gmail.com>
-Date: Thu, 15 Nov 2012 15:09:06 +0000
-Subject: Don't require libmozjs185 devel packages for polkit rules to work
-
-The SO-name rules for SpiderMonkey are a little bit weird and we were
-opening wrong file. This problem was reported in
-
- https://bugs.freedesktop.org/show_bug.cgi?id=57146
-
-Signed-off-by: David Zeuthen <zeuthen@gmail.com>
----
-diff --git a/src/polkitbackend/polkitbackendjsauthority.c b/src/polkitbackend/polkitbackendjsauthority.c
-index 034edc4..e4aa46b 100644
---- a/src/polkitbackend/polkitbackendjsauthority.c
-+++ b/src/polkitbackend/polkitbackendjsauthority.c
-@@ -238,7 +238,7 @@ djs_init (PolkitBackendJsAuthority *authority)
-   guint n;
-   const gchar *library_name;
- 
--  library_name = "libmozjs185.so";
-+  library_name = "libmozjs185.so.1.0";
-   module = g_module_open (library_name, 0);
-   if (module == NULL)
-     goto out;
---
-cgit v0.9.0.2-2-gbebe
-

polkit-link-gmodule.patch

@@ -1,23 +0,0 @@
-From ca1b0cd633fb14d2e152abd7b965b02ea58f66d0 Mon Sep 17 00:00:00 2001
-From: David Zeuthen <zeuthen@gmail.com>
-Date: Wed, 14 Nov 2012 19:29:16 +0000
-Subject: Include gmodule-2.0 to avoid linker errors
-
-Signed-off-by: David Zeuthen <zeuthen@gmail.com>
----
-diff --git a/configure.ac b/configure.ac
-index ecf56f1..fefde5d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -122,7 +122,7 @@ if test "x$GCC" = "xyes"; then
-   changequote([,])dnl
- fi
- 
--PKG_CHECK_MODULES(GLIB, [gio-2.0 >= 2.30.0])
-+PKG_CHECK_MODULES(GLIB, [gmodule-2.0 gio-2.0 >= 2.30.0])
- AC_SUBST(GLIB_CFLAGS)
- AC_SUBST(GLIB_LIBS)
- 
---
-cgit v0.9.0.2-2-gbebe
-

polkit.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Mon Jan 14 15:51:20 UTC 2013 - hrvoje.senjan@gmail.com
+
+- Update to 0.110
+  + Set XAUTHORITY environment variable if is unset
+  + Use mutex and condition variables properly
+  + Build fixes.
+- Changes from version 0.109:
+  + Include gmodule-2.0 to avoid linker errors
+  + Don't require libmozjs185 devel packages for polkit rules
+    to work
+- Drop polkit-link-gmodule.patch and polkit-libmozjs.patch, those
+  are merged upstream
+
 -------------------------------------------------------------------
 Wed Jan  9 14:08:57 UTC 2013 - saschpe@suse.de
 

polkit.spec

@@ -25,7 +25,7 @@ Name:           polkit
 Summary:        PolicyKit Authorization Framework
 License:        LGPL-2.1+
 Group:          System/Libraries
-Version:        0.108
+Version:        0.110
 Release:        0
 Url:            http://www.freedesktop.org/wiki/Software/PolicyKit
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -37,10 +37,6 @@ Patch0:         polkit-no-wheel-group.patch
 Patch1:         polkit-suid_flags.patch
 # PATCH-FIX-UPSTREAM polkit-no-systemd.patch bnc#782395 fdo#55377 vuntz@opensuse.org -- Do not reference non-existing polkit.service file for systemd (only applied if not built with systemd support)
 Patch2:         polkit-no-systemd.patch
-# PATCH-FIX-UPSTREAM polkit-link-gmodule.patch dimstar@opensuse.org -- Link against gmodule-2.0. Patch taken from upstream git.
-Patch3:         polkit-link-gmodule.patch
-# PATCH-FIX-UPSTREAM polkit-libmozjs.patch bnc#793562 fdo#57146 dimstar@opensuse.org -- dlopen libmozjs185.so.1.0 instead of libmozjs185.so, taken from upstream git.
-Patch4:         polkit-libmozjs.patch
 # needed for patch1
 BuildRequires:  autoconf
 # needed for patch1
@@ -130,12 +126,10 @@ This package provides the GObject Introspection bindings for PolicyKit.
 %if !(0%{?with_systemd})
 %patch2 -p1
 %endif
-%patch3 -p1
-%patch4 -p1
 
 %build
 export V=1
-# needed for patch1 and patch3
+# needed for patch1
 autoreconf -fi
 export SUID_CFLAGS="-fPIE"
 export SUID_LDFLAGS="-z now -pie"