summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArwed von Merkatz2009-10-13 17:02:54 +0200
committerArwed von Merkatz2009-10-23 18:59:13 +0200
commit407e1877b448c5b168457698e28ef7a8e66225bf (patch)
tree2261cf3bbb0f8034e82d39e569872ed966b13283
parent1f3569d288677d0db6169391fc2c251b43533a7e (diff)
policykit: don't build polkitagent if pam isn't used, bug 15427stable-rc-0.37
(cherry picked from commit e1dc9355e4540c479272bc8f2d1aee19b1ef4fc2)
-rw-r--r--gnome2-libs/policykit/HISTORY4
-rwxr-xr-xgnome2-libs/policykit/PRE_BUILD6
2 files changed, 10 insertions, 0 deletions
diff --git a/gnome2-libs/policykit/HISTORY b/gnome2-libs/policykit/HISTORY
index 36a64c822f..dfe5d30eb4 100644
--- a/gnome2-libs/policykit/HISTORY
+++ b/gnome2-libs/policykit/HISTORY
@@ -1,3 +1,7 @@
+2009-10-13 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * PRE_BUILD: work around bug #15427 by removing polkit-agent-helper
+ if linux-pam isn't chosen as authentication framework
+
2009-09-23 Vlad Glagolev <stealth@sourcemage.org>
* DEPENDS: gobject-introspection is _optional_; selinux flags don't
exist
diff --git a/gnome2-libs/policykit/PRE_BUILD b/gnome2-libs/policykit/PRE_BUILD
new file mode 100755
index 0000000000..6acda827eb
--- /dev/null
+++ b/gnome2-libs/policykit/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+if [[ $POLICYKIT_AFW != linux-pam ]]; then
+ # work around bug 15427 by removing polkitagent
+ sedit 's/polkitbackend polkitagent/polkitbackend/' src/Makefile.in
+fi