polkit: Tidy up polkit support

10 files changed, 32 insertions, 32 deletions

diff --git a/polkit/Makefile b/polkit/Makefile
new file mode 100644
index 00000000..34e81069
--- /dev/null
+++ b/polkit/Makefile
@@ -0,0 +1,24 @@
+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))
+
+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.rpmdrake-addmedia.policy.in b/polkit/org.mageia.drakrpm-addmedia.policy.in
index d4a58362..a42946ec 100644
--- a/polkit/policy/org.mageia.rpmdrake-addmedia.policy.in
+++ b/polkit/org.mageia.drakrpm-addmedia.policy.in
@@ -7,7 +7,7 @@
  <vendor>Mageia</vendor>
  <vendor_url>http://www.mageia.org/</vendor_url>
 
- <action id="org.mageia.rpmdrake-addmedia.pkexec.run">
+ <action id="org.mageia.drakrpm-addmedia.pkexec.run">
     <_description>Run Mageia Package Media Adder</_description>
     <_message>Authentication is required to run Mageia Package Media Adder</_message>
     <icon_name>rpmdrake</icon_name>
@@ -16,7 +16,7 @@
      <allow_inactive>no</allow_inactive>
      <allow_active>auth_admin_keep</allow_active>
     </defaults>
-    <annotate key="org.freedesktop.policykit.exec.path">/usr/libexec/gurpmi.addmedia</annotate>
+    <annotate key="org.freedesktop.policykit.exec.path">/usr/libexec/drakrpm-addmedia</annotate>
     <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
  </action>
 </policyconfig>
diff --git a/polkit/policy/org.mageia.rpmdrake-editmedia.policy.in b/polkit/org.mageia.drakrpm-editmedia.policy.in
index d250ca73..81008bba 100644
--- a/polkit/policy/org.mageia.rpmdrake-editmedia.policy.in
+++ b/polkit/org.mageia.drakrpm-editmedia.policy.in
@@ -7,7 +7,7 @@
  <vendor>Mageia</vendor>
  <vendor_url>http://www.mageia.org/</vendor_url>
 
- <action id="org.mageia.rpmdrake-editmedia.pkexec.run">
+ <action id="org.mageia.drakrpm-editmedia.pkexec.run">
     <_description>Run Mageia Package Media Editor</_description>
     <_message>Authentication is required to run Mageia Package Media Editor</_message>
     <icon_name>rpmdrake</icon_name>
@@ -16,7 +16,7 @@
      <allow_inactive>no</allow_inactive>
      <allow_active>auth_admin_keep</allow_active>
     </defaults>
-    <annotate key="org.freedesktop.policykit.exec.path">/usr/libexec/drakrpm-edit-media</annotate>
+    <annotate key="org.freedesktop.policykit.exec.path">/usr/libexec/drakrpm-editmedia</annotate>
     <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
  </action>
 </policyconfig>
diff --git a/polkit/policy/org.mageia.rpmdrake-update.policy.in b/polkit/org.mageia.drakrpm-update.policy.in
index ac7bf615..29096238 100644
--- a/polkit/policy/org.mageia.rpmdrake-update.policy.in
+++ b/polkit/org.mageia.drakrpm-update.policy.in
@@ -7,7 +7,7 @@
  <vendor>Mageia</vendor>
  <vendor_url>http://www.mageia.org/</vendor_url>
 
- <action id="org.mageia.rpmdrake-update.pkexec.run">
+ <action id="org.mageia.drakrpm-update.pkexec.run">
     <_description>Run Mageia Updater</_description>
     <_message>Authentication is required to run Mageia Updater</_message>
     <icon_name>rpmdrake</icon_name>
@@ -16,7 +16,7 @@
      <allow_inactive>no</allow_inactive>
      <allow_active>auth_self_keep</allow_active>
     </defaults>
-    <annotate key="org.freedesktop.policykit.exec.path">/usr/libexec/MageiaUpdate</annotate>
+    <annotate key="org.freedesktop.policykit.exec.path">/usr/libexec/drakrpm-update</annotate>
     <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
  </action>
 </policyconfig>
diff --git a/polkit/policy/org.mageia.rpmdrake.policy.in b/polkit/org.mageia.drakrpm.policy.in
index bdc43360..6af5277c 100644
--- a/polkit/policy/org.mageia.rpmdrake.policy.in
+++ b/polkit/org.mageia.drakrpm.policy.in
@@ -7,7 +7,7 @@
  <vendor>Mageia</vendor>
  <vendor_url>http://www.mageia.org/</vendor_url>
 
- <action id="org.mageia.rpmdrake.pkexec.run">
+ <action id="org.mageia.drakrpm.pkexec.run">
     <_description>Run Mageia Package Manager</_description>
     <_message>Authentication is required to run Mageia Package Manager</_message>
     <icon_name>rpmdrake</icon_name>
@@ -16,7 +16,7 @@
      <allow_inactive>no</allow_inactive>
      <allow_active>auth_admin_keep</allow_active>
     </defaults>
-    <annotate key="org.freedesktop.policykit.exec.path">/usr/libexec/rpmdrake</annotate>
+    <annotate key="org.freedesktop.policykit.exec.path">/usr/libexec/drakrpm</annotate>
     <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
  </action>
 </policyconfig>
diff --git a/polkit/policy/Makefile b/polkit/policy/Makefile
deleted file mode 100644
index 1de72221..00000000
--- a/polkit/policy/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-POLKITPOLICYDEST = $(DESTDIR)/usr/share/polkit-1/actions
-
-POLICY_IN := $(wildcard *.policy.in)
-POLICY = $(POLICY_IN:.policy.in=.policy)
-
-all: $(POLICY)
-
-clean:
-	rm -f $(POLICY)
-
-install: all
-	install -d $(POLKITPOLICYDEST)
-	install -m644 $(POLICY) $(POLKITPOLICYDEST)
-
-%.policy:   %.policy.in
-	intltool-merge --utf8 ../../po $< $@ -x -u -c ../../po/.intltool-merge-cache
diff --git a/polkit/wrappers/MageiaUpdate b/polkit/wrappers/MageiaUpdate
deleted file mode 100755
index f732b981..00000000
--- a/polkit/wrappers/MageiaUpdate
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/pkexec /usr/libexec/MageiaUpdate $*
diff --git a/polkit/wrappers/drakrpm-edit-media b/polkit/wrappers/drakrpm-edit-media
deleted file mode 100755
index 30fb48d3..00000000
--- a/polkit/wrappers/drakrpm-edit-media
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/pkexec /usr/libexec/drakrpm-edit-media $*
diff --git a/polkit/wrappers/gurpmi.addmedia b/polkit/wrappers/gurpmi.addmedia
deleted file mode 100755
index 2e029258..00000000
--- a/polkit/wrappers/gurpmi.addmedia
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/pkexec /usr/libexec/gurpmi.addmedia $*
diff --git a/polkit/wrappers/rpmdrake b/polkit/wrappers/rpmdrake
deleted file mode 100755
index 60a00841..00000000
--- a/polkit/wrappers/rpmdrake
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/pkexec /usr/libexec/rpmdrake $*