From efa4ab6a791804db20492634decf3a53c74951c4 Mon Sep 17 00:00:00 2001
From: SARL ENR-68 <david@david.david>
Date: Sat, 28 Dec 2013 10:43:02 +0100
Subject: Updated Makefile files (polkit) and spec file

-Really use translations for polkit file
-drop "local" macro PREFIX on Makefile
-drop "PREFIX="%{_prefix}" macro on spec file
-use polkit binary generated with Makefile
-drop bin folder (use binary generated with Makefile)
---
 Makefile        |  4 ++--
 bin/isodumper   | 14 --------------
 isodumper.spec  |  2 +-
 polkit/Makefile | 17 ++++++++++++++++-
 4 files changed, 19 insertions(+), 18 deletions(-)
 delete mode 100644 bin/isodumper

diff --git a/Makefile b/Makefile
index 4be6194..84a60d2 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@
 # Author isodumper software= papoteur <papoteur@mageialinux-online.org>
 # Author Makefile file= Geiger David <david.david@mageialinux-online.org>
 
-PREFIX=/usr/local
+PREFIX=/usr
 BINDIR=$(PREFIX)/bin
 SBINDIR=$(PREFIX)/sbin
 LIBDIR=$(PREFIX)/lib
@@ -47,7 +47,7 @@ install: all
 	# for binary file isodumper on /usr/bin/ 
 	# to have authentication with polkit (use for mageia policy)
 	mkdir -p $(DESTDIR)$(BINDIR)
-	install -m 755 bin/isodumper $(DESTDIR)$(BINDIR)
+	install -m 755 polkit/isodumper $(DESTDIR)$(BINDIR)
 
 	# for policy file isodumper on /usr/share/polkit-1/actions/ 
 	# to have authentication with polkit (use for mageia policy)	
diff --git a/bin/isodumper b/bin/isodumper
deleted file mode 100644
index c5dc766..0000000
--- a/bin/isodumper
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-#
-
-# Copyright (C) 2013 THE isodumper'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the isodumper package.
-
-# Author isodumper software= papoteur <papoteur@mageialinux-online.org>
-# Author binary polkit file= Geiger David <david.david@mageialinux-online.org>
-
-if  [[ "$EUID" != "0" ]] ; then
-    exec /usr/bin/pkexec /usr/libexec/isodumper "$@"
-else
-    exec /usr/libexec/isodumper "$@"
-fi
diff --git a/isodumper.spec b/isodumper.spec
index e986489..b76a178 100644
--- a/isodumper.spec
+++ b/isodumper.spec
@@ -43,7 +43,7 @@ Ce logiciel est écrit en python.
 %make
 
 %install
-%makeinstall_std PREFIX="%{_prefix}"
+%makeinstall_std
 
 %find_lang %{name}
 
diff --git a/polkit/Makefile b/polkit/Makefile
index 975400d..f8833cb 100644
--- a/polkit/Makefile
+++ b/polkit/Makefile
@@ -28,7 +28,22 @@ 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' > $@
+	@echo -e \
+	'#!/bin/sh\n'\
+	'#\n'\
+	'\n'\
+	'# Copyright (C) 2013 THE isodumper`S COPYRIGHT HOLDER\n'\
+	'# This file is distributed under the same license as the isodumper package.\n'\
+	'\n'\
+	'# Author isodumper software= papoteur <papoteur@mageialinux-online.org>\n'\
+	'# Author binary polkit file= Geiger David <david.david@mageialinux-online.org>\n'\
+	'\n'\
+	'if  [[ "$$UID" != "0" ]] ; then\n'\
+	'    exec $(BINDIR)/pkexec $(LIBEXECDIR)/$@ "$$''@"\n'\
+	'else\n'\
+	'    exec $(LIBEXECDIR)/$@ "$$''@"\n'\
+	'fi\n'\
+	> $@
 
 %.policy: %.policy.in
 	intltool-merge --utf8 ../po $< $@ -x -u -c ../po/.intltool-merge-cache
-- 
cgit v1.2.1