From 077fefe49f3aace1e71d12bb15ac2c435631dcaf Mon Sep 17 00:00:00 2001 From: David Zeuthen Date: Wed, 19 Dec 2012 10:12:09 -0500 Subject: [PATCH] Update to upstream release 0.109 - Drop upstreamed patches --- .gitignore | 1 + polkit-0.108-fix-libmozjs185-soname.patch | 32 ----------------------- polkit-0.108-include-gmodule.patch | 26 ------------------ polkit.spec | 15 +++++------ sources | 2 +- 5 files changed, 9 insertions(+), 67 deletions(-) delete mode 100644 polkit-0.108-fix-libmozjs185-soname.patch delete mode 100644 polkit-0.108-include-gmodule.patch diff --git a/.gitignore b/.gitignore index 315fd32..d9c435f 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/polkit-0.108-fix-libmozjs185-soname.patch b/polkit-0.108-fix-libmozjs185-soname.patch deleted file mode 100644 index ef781da..0000000 --- a/polkit-0.108-fix-libmozjs185-soname.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a6747362693a91f8cfa3bd5e619cf91e2e03941b Mon Sep 17 00:00:00 2001 -From: David Zeuthen -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 ---- - 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 - diff --git a/polkit-0.108-include-gmodule.patch b/polkit-0.108-include-gmodule.patch deleted file mode 100644 index 8b06b2d..0000000 --- a/polkit-0.108-include-gmodule.patch +++ /dev/null @@ -1,26 +0,0 @@ -From ca1b0cd633fb14d2e152abd7b965b02ea58f66d0 Mon Sep 17 00:00:00 2001 -From: David Zeuthen -Date: Wed, 14 Nov 2012 14:29:16 -0500 -Subject: [PATCH] Include gmodule-2.0 to avoid linker errors - -Signed-off-by: David Zeuthen ---- - 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 - diff --git a/polkit.spec b/polkit.spec index 3218bb0..237b2fd 100644 --- a/polkit.spec +++ b/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 0.109-1%{?dist} +- Update to upstream release 0.109 +- Drop upstreamed patches + * Thu Nov 15 2012 David Zeuthen 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) diff --git a/sources b/sources index 965689a..1f5373e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -55cd17b20030d895a7ecf1b9c9b32fb6 polkit-0.108.tar.gz +8c3f08287dd3e1e546e3c2ae00090908 polkit-0.109.tar.gz