diff options
| author | Colin Guthrie <colin@mageia.org> | 2013-10-12 13:50:02 +0100 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2013-10-12 13:53:45 +0100 |
| commit | 811ac7a07941f11e4e8acfcba9b75d50d009f798 (patch) | |
| tree | 08cab7d5b63f664e8eed372708919cffe17a76d2 /polkit | |
| parent | 348852a7c7a039f8c53dd017ea7f4d4f03bbca92 (diff) | |
| download | control-center-811ac7a07941f11e4e8acfcba9b75d50d009f798.tar control-center-811ac7a07941f11e4e8acfcba9b75d50d009f798.tar.gz control-center-811ac7a07941f11e4e8acfcba9b75d50d009f798.tar.bz2 control-center-811ac7a07941f11e4e8acfcba9b75d50d009f798.tar.xz control-center-811ac7a07941f11e4e8acfcba9b75d50d009f798.zip | |
polkit: Tidy up polkit support
Diffstat (limited to 'polkit')
| -rw-r--r-- | polkit/Makefile | 26 | ||||
| -rw-r--r-- | polkit/org.mageia.drakconf.policy.in (renamed from polkit/policy/org.mageia.control-centre-gui.policy.in) | 4 | ||||
| -rw-r--r-- | polkit/org.mageia.drakxconf.policy.in (renamed from polkit/policy/org.mageia.control-centre.policy.in) | 4 | ||||
| -rwxr-xr-x | polkit/wrappers/drakxconf | 2 |
4 files changed, 30 insertions, 6 deletions
diff --git a/polkit/Makefile b/polkit/Makefile new file mode 100644 index 00000000..4c379cd8 --- /dev/null +++ b/polkit/Makefile @@ -0,0 +1,26 @@ +BINDIR = /usr/bin +LIBEXECDIR = /usr/libexec +BINDEST = $(DESTDIR)$(BINDIR) +POLKITPOLICYDEST = $(DESTDIR)/usr/share/polkit-1/actions + +POLICY_IN := $(wildcard *.policy.in) +POLICY = $(POLICY_IN:.policy.in=.policy) +WRAPPERS = $(patsubst org.mageia.%.policy,%,$(POLICY)) +# Hack for custom wrapper for drakconf +WRAPPERS = drakxconf + +all: $(WRAPPERS) $(POLICY) + +clean: + rm -f $(WRAPPERS) $(POLICY) + +%: org.mageia.%.policy.in + @echo -e "#!/bin/sh\nexec $(BINDIR)/pkexec $(LIBEXECDIR)/$@ $$""*" > $@ + +%.policy: %.policy.in + intltool-merge --utf8 ../po $< $@ -x -u -c ../po/.intltool-merge-cache + +install: all + install -d $(BINDEST) $(POLKITPOLICYDEST) + install -m755 $(WRAPPERS) $(BINDEST) + install -m644 $(POLICY) $(POLKITPOLICYDEST) diff --git a/polkit/policy/org.mageia.control-centre-gui.policy.in b/polkit/org.mageia.drakconf.policy.in index 958ca7a6..1fc2a36a 100644 --- a/polkit/policy/org.mageia.control-centre-gui.policy.in +++ b/polkit/org.mageia.drakconf.policy.in @@ -4,10 +4,10 @@ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd"> <policyconfig> - <vendor>Mageia Control Centre GUI</vendor> + <vendor>Mageia</vendor> <vendor_url>http://mageia.org/control-centre-gui</vendor_url> - <action id="org.mageia.control-centre-gui.pkexec.run"> + <action id="org.mageia.drakconf.pkexec.run"> <_description>Run Mageia Control Centre GUI</_description> <_message>Authentication is required to run Mageia Control Centre GUI</_message> <icon_name>drakconf</icon_name> diff --git a/polkit/policy/org.mageia.control-centre.policy.in b/polkit/org.mageia.drakxconf.policy.in index 4772b0fc..c4f63791 100644 --- a/polkit/policy/org.mageia.control-centre.policy.in +++ b/polkit/org.mageia.drakxconf.policy.in @@ -4,10 +4,10 @@ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd"> <policyconfig> - <vendor>Mageia Control Centre</vendor> + <vendor>Mageia</vendor> <vendor_url>http://mageia.org/control-centre</vendor_url> - <action id="org.mageia.control-centre.pkexec.run"> + <action id="org.mageia.drakxconf.pkexec.run"> <_description>Run Mageia Control Centre</_description> <_message>Authentication is required to run Mageia Control Centre</_message> <icon_name>drakconf</icon_name> diff --git a/polkit/wrappers/drakxconf b/polkit/wrappers/drakxconf deleted file mode 100755 index db38e46a..00000000 --- a/polkit/wrappers/drakxconf +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /usr/bin/pkexec /usr/libexec/drakxconf |