Update to upstream release 0.109
- Drop upstreamed patches
This commit is contained in:
parent
75c0e048b8
commit
077fefe49f
1
.gitignore
vendored
1
.gitignore
vendored
@ -15,3 +15,4 @@ polkit-0.98.tar.gz
|
||||
/polkit-0.106.tar.gz
|
||||
/polkit-0.107.tar.gz
|
||||
/polkit-0.108.tar.gz
|
||||
/polkit-0.109.tar.gz
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
From a6747362693a91f8cfa3bd5e619cf91e2e03941b Mon Sep 17 00:00:00 2001
|
||||
From: David Zeuthen <zeuthen@gmail.com>
|
||||
Date: Thu, 15 Nov 2012 10:09:06 -0500
|
||||
Subject: [PATCH] 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>
|
||||
---
|
||||
src/polkitbackend/polkitbackendjsauthority.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
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;
|
||||
--
|
||||
1.8.0
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
From ca1b0cd633fb14d2e152abd7b965b02ea58f66d0 Mon Sep 17 00:00:00 2001
|
||||
From: David Zeuthen <zeuthen@gmail.com>
|
||||
Date: Wed, 14 Nov 2012 14:29:16 -0500
|
||||
Subject: [PATCH] Include gmodule-2.0 to avoid linker errors
|
||||
|
||||
Signed-off-by: David Zeuthen <zeuthen@gmail.com>
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
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)
|
||||
|
||||
--
|
||||
1.8.0
|
||||
|
||||
15
polkit.spec
15
polkit.spec
@ -1,12 +1,12 @@
|
||||
# Only enable if using patches that touches configure.ac,
|
||||
# Makefile.am or other build system related files
|
||||
#
|
||||
%define enable_autoreconf 1
|
||||
%define enable_autoreconf 0
|
||||
|
||||
Summary: polkit Authorization Framework
|
||||
Name: polkit
|
||||
Version: 0.108
|
||||
Release: 3%{?dist}
|
||||
Version: 0.109
|
||||
Release: 1%{?dist}
|
||||
License: LGPLv2+
|
||||
URL: http://www.freedesktop.org/wiki/Software/polkit
|
||||
Source0: http://www.freedesktop.org/software/polkit/releases/%{name}-%{version}.tar.gz
|
||||
@ -40,9 +40,6 @@ Conflicts: polkit-gnome < 0.97
|
||||
Obsoletes: polkit-desktop-policy < 0.103
|
||||
Provides: polkit-desktop-policy = 0.103
|
||||
|
||||
Patch0: polkit-0.108-include-gmodule.patch
|
||||
Patch1: polkit-0.108-fix-libmozjs185-soname.patch
|
||||
|
||||
%description
|
||||
polkit is a toolkit for defining and handling authorizations. It is
|
||||
used for allowing unprivileged processes to speak to privileged
|
||||
@ -82,8 +79,6 @@ Meta-package for JavaScript engine used by polkit.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1 -b .include-gmodule
|
||||
%patch1 -p1 -b .libmozjs185-soname
|
||||
|
||||
%build
|
||||
%if 0%{?enable_autoreconf}
|
||||
@ -165,6 +160,10 @@ exit 0
|
||||
%{_datadir}/doc/polkit-js-engine-%{version}/README
|
||||
|
||||
%changelog
|
||||
* Wed Dec 19 2012 David Zeuthen <davidz@redhat.com> 0.109-1%{?dist}
|
||||
- Update to upstream release 0.109
|
||||
- Drop upstreamed patches
|
||||
|
||||
* Thu Nov 15 2012 David Zeuthen <davidz@redhat.com> 0.108-3%{?dist}
|
||||
- Attempt to open the correct libmozjs185 library, otherwise polkit
|
||||
authz rules will not work unless js-devel is installed (fdo #57146)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user