From 69cf1f60c7d24c5c4267c69c7b08c80d4d10d5e0 Mon Sep 17 00:00:00 2001
From: Colin Guthrie <colin@mageia.org>
Date: Sat, 12 Oct 2013 13:58:57 +0100
Subject: polkit: Tidy up polkit support

---
 Makefile                                  |  7 +++----
 NEWS                                      |  2 ++
 po/Makefile                               |  2 +-
 polkit/Makefile                           | 24 ++++++++++++++++++++++++
 polkit/org.mageia.drak3d.policy.in        | 22 ++++++++++++++++++++++
 polkit/policy/Makefile                    | 16 ----------------
 polkit/policy/org.mageia.drak3d.policy.in | 22 ----------------------
 polkit/wrappers/drak3d                    |  2 --
 8 files changed, 52 insertions(+), 45 deletions(-)
 create mode 100644 polkit/Makefile
 create mode 100644 polkit/org.mageia.drak3d.policy.in
 delete mode 100644 polkit/policy/Makefile
 delete mode 100644 polkit/policy/org.mageia.drak3d.policy.in
 delete mode 100755 polkit/wrappers/drak3d

diff --git a/Makefile b/Makefile
index a02f161..ddc3467 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ BIN_TOOLS= drak3d
 all:
 	(find lib -name '*.pm'; find bin -type f) | xargs perl -pi -e 's/\s*use\s+(diagnostics|vars|strict).*//g'
 	make -C po
-	make -C polkit/policy
+	make -C polkit
 
 check:
 	@for p in `find lib -name *.pm`; do perl -cw -I$(libdir)/libDrakX $$p || exit 1; done
@@ -27,18 +27,17 @@ install:
 	cp -a lib/* $(DESTDIR)$(libdir)/libDrakX/
 	(cd bin; \
 	  install -m755 $(BIN_TOOLS) $(DESTDIR)$(libexecdir); \
-	  install -m755 ../polkit/wrappers/* $(DESTDIR)$(bindir); \
 	)
 	#install -m644 $(wildcard data/*.desktop) $(DESTDIR)$(desktopdir)
 	install -m644 $(wildcard data/icons/*.png) $(DESTDIR)$(iconsdir)
 	#install -m644 $(wildcard data/pixmaps/*.png) $(DESTDIR)$(pixmapsdir)
 	#perl -pe 's/\s+--force//g' $(DESTDIR)$(desktopdir)/net_applet.desktop > $(DESTDIR)$(autostartdir)/net_applet.desktop
 	make -C po install
-	make -C polkit/policy install
+	make -C polkit install
 
 clean:
 	make -C po clean
-	make -C polkit/policy clean
+	make -C polkit clean
 
 dist: dis 
 dis:
diff --git a/NEWS b/NEWS
index 720b472..edaccef 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- tidy up polkit support
+
 1.33
 - use polkit for authorisation (mga#11125)
 
diff --git a/po/Makefile b/po/Makefile
index efcf69b..7e8a698 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -32,7 +32,7 @@ $(POTFILE): $(PL_FILES) POTFILES.in
 	rm -f non-perl.pot ..$@ .$@
 
 POTFILES.in:
-	(cd .. ; /bin/ls -1 polkit/policy/*.policy.in; ) > POTFILES.in
+	(cd .. ; /bin/ls -1 polkit/*.policy.in; ) > POTFILES.in
 
 update_n_merge: $(POTFILE) merge
 
diff --git a/polkit/Makefile b/polkit/Makefile
new file mode 100644
index 0000000..34e8106
--- /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/org.mageia.drak3d.policy.in b/polkit/org.mageia.drak3d.policy.in
new file mode 100644
index 0000000..ce262ec
--- /dev/null
+++ b/polkit/org.mageia.drak3d.policy.in
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
+"-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+"http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
+<policyconfig>
+
+ <vendor>Mageia</vendor>
+ <vendor_url>http://www.mageia.org/</vendor_url>
+
+ <action id="org.mageia.drak3d.pkexec.run">
+    <_description>Run Mageia 3D Desktop Configuration</_description>
+    <_message>Authentication is required to run Mageia 3D Desktop Configuration</_message>
+    <icon_name>drakconf</icon_name>
+    <defaults>
+     <allow_any>no</allow_any>
+     <allow_inactive>no</allow_inactive>
+     <allow_active>auth_self_keep</allow_active>
+    </defaults>
+    <annotate key="org.freedesktop.policykit.exec.path">/usr/libexec/drak3d</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 1de7222..0000000
--- 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/policy/org.mageia.drak3d.policy.in b/polkit/policy/org.mageia.drak3d.policy.in
deleted file mode 100644
index ce262ec..0000000
--- a/polkit/policy/org.mageia.drak3d.policy.in
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE policyconfig PUBLIC
-"-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
-"http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
-<policyconfig>
-
- <vendor>Mageia</vendor>
- <vendor_url>http://www.mageia.org/</vendor_url>
-
- <action id="org.mageia.drak3d.pkexec.run">
-    <_description>Run Mageia 3D Desktop Configuration</_description>
-    <_message>Authentication is required to run Mageia 3D Desktop Configuration</_message>
-    <icon_name>drakconf</icon_name>
-    <defaults>
-     <allow_any>no</allow_any>
-     <allow_inactive>no</allow_inactive>
-     <allow_active>auth_self_keep</allow_active>
-    </defaults>
-    <annotate key="org.freedesktop.policykit.exec.path">/usr/libexec/drak3d</annotate>
-    <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
- </action>
-</policyconfig>
diff --git a/polkit/wrappers/drak3d b/polkit/wrappers/drak3d
deleted file mode 100755
index 1f54048..0000000
--- a/polkit/wrappers/drak3d
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/pkexec /usr/libexec/drak3d $*
-- 
cgit v1.2.1