31 files changed, 32 insertions, 51 deletions
diff --git a/Makefile b/Makefile
index 186240d..579a468 100644
--- a/Makefile
+++ b/Makefile
@@ -10,8 +10,6 @@ desktopdir=/usr/share/applications
 autostartdir=/etc/xdg/autostart
 iconsdir=/usr/lib/libDrakX/icons
 pixmapsdir=/usr/share/libDrakX/pixmaps
-pamdir=/etc/pam.d
-consoleappsdir=/etc/security/console.apps
 
 USER_TOOLS=net_applet
 ROOT_TOOLS=drakconnect drakfirewall drakgw drakhosts drakids drakinvictus draknetprofile draknfs drakproxy drakroam draksambashare drakvpn draknetcenter
@@ -19,7 +17,7 @@ ROOT_TOOLS=drakconnect drakfirewall drakgw drakhosts drakids drakinvictus drakne
 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
 	make -C data
 
 check:
@@ -27,21 +25,19 @@ check:
 	@for p in bin/*; do perl -cw $$p || exit 1; done
 
 install:
-	install -d $(DESTDIR){$(libdir),$(bindir),$(libexecdir),$(desktopdir),$(autostartdir),$(iconsdir),$(pixmapsdir),$(pamdir),$(consoleappsdir)}
+	install -d $(DESTDIR){$(libdir),$(bindir),$(libexecdir),$(desktopdir),$(autostartdir),$(iconsdir),$(pixmapsdir)}
 	cp -a lib/* $(DESTDIR)$(libdir)/libDrakX/
 	find $(DESTDIR) -name .perl_checker -exec rm {} \;
 	(cd bin && \
 	  install -m755 $(USER_TOOLS) $(DESTDIR)$(bindir) && \
-	  install -m755 $(ROOT_TOOLS) $(DESTDIR)$(libexecdir) && \
-	  cd ../polkit/wrappers && \
-	  install -m755 $(ROOT_TOOLS) $(DESTDIR)$(bindir) \
+	  install -m755 $(ROOT_TOOLS) $(DESTDIR)$(libexecdir) \
 	)
 	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
 
 cleandist:
 	rm -rf $(NAME)-$(VERSION) ../$(NAME)-$(VERSION).tar*
@@ -54,6 +50,7 @@ dist: cleandist
 
 clean:
 	make -C po clean
+	make -C polkit clean
 
 .PHONY: ChangeLog log changelog
 
diff --git a/NEWS b/NEWS
index ebfc0e5..6235e09 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- tidy up polkit support
+
 1.27
 - fix namespace problem on root user check (mga#11332)
 
diff --git a/po/Makefile b/po/Makefile
index cd0559e..57009e6 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -36,7 +36,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..b996120
--- /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\n$(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.drakconnect.policy.in b/polkit/org.mageia.drakconnect.policy.in
index d7432ac..d7432ac 100644
--- a/polkit/policy/org.mageia.drakconnect.policy.in
+++ b/polkit/org.mageia.drakconnect.policy.in
diff --git a/polkit/policy/org.mageia.drakfirewall.policy.in b/polkit/org.mageia.drakfirewall.policy.in
index 3b15fc9..3b15fc9 100644
--- a/polkit/policy/org.mageia.drakfirewall.policy.in
+++ b/polkit/org.mageia.drakfirewall.policy.in
diff --git a/polkit/policy/org.mageia.drakgw.policy.in b/polkit/org.mageia.drakgw.policy.in
index 496ad3b..496ad3b 100644
--- a/polkit/policy/org.mageia.drakgw.policy.in
+++ b/polkit/org.mageia.drakgw.policy.in
diff --git a/polkit/policy/org.mageia.drakhosts.policy.in b/polkit/org.mageia.drakhosts.policy.in
index 93cc6d5..93cc6d5 100644
--- a/polkit/policy/org.mageia.drakhosts.policy.in
+++ b/polkit/org.mageia.drakhosts.policy.in
diff --git a/polkit/policy/org.mageia.drakids.policy.in b/polkit/org.mageia.drakids.policy.in
index de0647d..de0647d 100644
--- a/polkit/policy/org.mageia.drakids.policy.in
+++ b/polkit/org.mageia.drakids.policy.in
diff --git a/polkit/policy/org.mageia.drakinvictus.policy.in b/polkit/org.mageia.drakinvictus.policy.in
index 25f6264..25f6264 100644
--- a/polkit/policy/org.mageia.drakinvictus.policy.in
+++ b/polkit/org.mageia.drakinvictus.policy.in
diff --git a/polkit/policy/org.mageia.draknetcenter.policy.in b/polkit/org.mageia.draknetcenter.policy.in
index 3848592..3848592 100644
--- a/polkit/policy/org.mageia.draknetcenter.policy.in
+++ b/polkit/org.mageia.draknetcenter.policy.in
diff --git a/polkit/policy/org.mageia.draknetprofile.policy.in b/polkit/org.mageia.draknetprofile.policy.in
index 2ae364b..2ae364b 100644
--- a/polkit/policy/org.mageia.draknetprofile.policy.in
+++ b/polkit/org.mageia.draknetprofile.policy.in
diff --git a/polkit/policy/org.mageia.draknfs.policy.in b/polkit/org.mageia.draknfs.policy.in
index cec39f6..cec39f6 100644
--- a/polkit/policy/org.mageia.draknfs.policy.in
+++ b/polkit/org.mageia.draknfs.policy.in
diff --git a/polkit/policy/org.mageia.drakproxy.policy.in b/polkit/org.mageia.drakproxy.policy.in
index 46e9860..46e9860 100644
--- a/polkit/policy/org.mageia.drakproxy.policy.in
+++ b/polkit/org.mageia.drakproxy.policy.in
diff --git a/polkit/policy/org.mageia.drakroam.policy.in b/polkit/org.mageia.drakroam.policy.in
index 060a4a3..060a4a3 100644
--- a/polkit/policy/org.mageia.drakroam.policy.in
+++ b/polkit/org.mageia.drakroam.policy.in
diff --git a/polkit/policy/org.mageia.draksambashare.policy.in b/polkit/org.mageia.draksambashare.policy.in
index 1836316..1836316 100644
--- a/polkit/policy/org.mageia.draksambashare.policy.in
+++ b/polkit/org.mageia.draksambashare.policy.in
diff --git a/polkit/policy/org.mageia.drakvpn.policy.in b/polkit/org.mageia.drakvpn.policy.in
index f026f39..f026f39 100644
--- a/polkit/policy/org.mageia.drakvpn.policy.in
+++ b/polkit/org.mageia.drakvpn.policy.in
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/wrappers/drakconnect b/polkit/wrappers/drakconnect
deleted file mode 100755
index 7f2ee3f..0000000
--- a/polkit/wrappers/drakconnect
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/pkexec /usr/libexec/drakconnect $*
diff --git a/polkit/wrappers/drakfirewall b/polkit/wrappers/drakfirewall
deleted file mode 100755
index 9cf24ca..0000000
--- a/polkit/wrappers/drakfirewall
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/pkexec /usr/libexec/drakfirewall $*
diff --git a/polkit/wrappers/drakgw b/polkit/wrappers/drakgw
deleted file mode 100755
index 240f80f..0000000
--- a/polkit/wrappers/drakgw
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/pkexec /usr/libexec/drakgw $*
diff --git a/polkit/wrappers/drakhosts b/polkit/wrappers/drakhosts
deleted file mode 100755
index d028be8..0000000
--- a/polkit/wrappers/drakhosts
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/pkexec /usr/libexec/drakhosts $*
diff --git a/polkit/wrappers/drakids b/polkit/wrappers/drakids
deleted file mode 100755
index 8a5b73f..0000000
--- a/polkit/wrappers/drakids
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/pkexec /usr/libexec/drakids $*
diff --git a/polkit/wrappers/drakinvictus b/polkit/wrappers/drakinvictus
deleted file mode 100755
index d7f0a62..0000000
--- a/polkit/wrappers/drakinvictus
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/pkexec /usr/libexec/drakinvictus $*
diff --git a/polkit/wrappers/draknetcenter b/polkit/wrappers/draknetcenter
deleted file mode 100755
index 47c6f55..0000000
--- a/polkit/wrappers/draknetcenter
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/pkexec /usr/libexec/draknetcenter $*
diff --git a/polkit/wrappers/draknetprofile b/polkit/wrappers/draknetprofile
deleted file mode 100755
index e1e5bd7..0000000
--- a/polkit/wrappers/draknetprofile
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/pkexec /usr/libexec/draknetprofile $*
diff --git a/polkit/wrappers/draknfs b/polkit/wrappers/draknfs
deleted file mode 100755
index 2e90f23..0000000
--- a/polkit/wrappers/draknfs
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/pkexec /usr/libexec/draknfs $*
diff --git a/polkit/wrappers/drakproxy b/polkit/wrappers/drakproxy
deleted file mode 100755
index 3bb43c8..0000000
--- a/polkit/wrappers/drakproxy
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/pkexec /usr/libexec/drakproxy $*
diff --git a/polkit/wrappers/drakroam b/polkit/wrappers/drakroam
deleted file mode 100755
index 9b5747e..0000000
--- a/polkit/wrappers/drakroam
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/pkexec /usr/libexec/drakroam $*
diff --git a/polkit/wrappers/draksambashare b/polkit/wrappers/draksambashare
deleted file mode 100755
index 13e4c91..0000000
--- a/polkit/wrappers/draksambashare
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/pkexec /usr/libexec/draksambashare $*
diff --git a/polkit/wrappers/drakvpn b/polkit/wrappers/drakvpn
deleted file mode 100755
index 17d091f..0000000
--- a/polkit/wrappers/drakvpn
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/pkexec /usr/libexec/drakvpn $*