From d21a459a1cc8ba267d96af1a5cd619ecc937cde8 Mon Sep 17 00:00:00 2001 From: Yuri Chornoivan Date: Mon, 23 Dec 2013 19:33:01 +0200 Subject: Really use translations for polkit file --- Makefile | 10 +++++--- polkit/Makefile | 24 +++++++++++++++++ polkit/org.mageia.isodumper.policy.in | 8 ------ share/polkit-1/actions/org.mageia.isodumper.policy | 30 ---------------------- 4 files changed, 31 insertions(+), 41 deletions(-) create mode 100644 polkit/Makefile delete mode 100644 share/polkit-1/actions/org.mageia.isodumper.policy diff --git a/Makefile b/Makefile index a945b76..4be6194 100644 --- a/Makefile +++ b/Makefile @@ -25,10 +25,14 @@ PIXMAPSDIR=$(PREFIX)/share/pixmaps LOCALEDIR=$(PREFIX) DOCDIR=$(PREFIX)/share/doc/isodumper PYTHON=/usr/bin/env python +DIRS = polkit +all: dirs -all: isodumper COPYING CHANGELOG - +dirs: + @for n in . $(DIRS); do \ + [ "$$n" = "." ] || make -C $$n || cd .. || exit 1 ;\ + done clean: rm -f isodumper COPYING CHANGELOG @@ -48,7 +52,7 @@ install: all # for policy file isodumper on /usr/share/polkit-1/actions/ # to have authentication with polkit (use for mageia policy) mkdir -p $(DESTDIR)$(POLKITPOLICYDIR) - install -m 644 share/polkit-1/actions/org.mageia.isodumper.policy $(DESTDIR)$(POLKITPOLICYDIR) + install -m 644 polkit/org.mageia.isodumper.policy $(DESTDIR)$(POLKITPOLICYDIR) # for LIBFILES isodumper.py find_devices mkdir -p $(DESTDIR)$(LIBDIR)/isodumper diff --git a/polkit/Makefile b/polkit/Makefile new file mode 100644 index 0000000..dc7c4ba --- /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\nif [[ "$$UID" != "0" ]] ; then\n exec $(BINDIR)/pkexec $(LIBEXECDIR)/$@ "$$''@"\nelse\n exec $(LIBEXECDIR)/$@ "$$''@"\nfi\n' > $@ + +%.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.isodumper.policy.in b/polkit/org.mageia.isodumper.policy.in index 860749d..749aa6f 100644 --- a/polkit/org.mageia.isodumper.policy.in +++ b/polkit/org.mageia.isodumper.policy.in @@ -9,15 +9,7 @@ <_description>Run Isodumper - Exécuter Isodumper - Isodumper - Isodumper - Isodumper - Isodumper - Isodumper <_message>Authentication is required to run Isodumper - Une authentification est nécessaire pour exécuter IsoDumper - Per a accedir al Isodumper cal autenticació isodumper no diff --git a/share/polkit-1/actions/org.mageia.isodumper.policy b/share/polkit-1/actions/org.mageia.isodumper.policy deleted file mode 100644 index 03655f5..0000000 --- a/share/polkit-1/actions/org.mageia.isodumper.policy +++ /dev/null @@ -1,30 +0,0 @@ - - - - - Mageia - http://mageia.org/ - - - Run Isodumper - Exécuter Isodumper - Isodumper - Isodumper - Isodumper - Isodumper - Isodumper - Authentication is required to run Isodumper - Une authentification est nécessaire pour exécuter IsoDumper - Per a accedir al Isodumper cal autenticació - isodumper - - no - no - auth_admin_keep - - /usr/libexec/isodumper - true - - \ No newline at end of file -- cgit v1.2.1