From 2e6c8115416714c469b79ba93d3cc6f59b569585 Mon Sep 17 00:00:00 2001
From: SARL ENR-68 <david@david.david>
Date: Sun, 22 Dec 2013 22:58:54 +0100
Subject: Modifications to have authentication with polkit

-use mageia polkit policy instead of usermode.
-drop usermode-consoleonly package.
-update Makefile.
-update spec file.
-update Readme file.
-update Changelog file.
---
 CHANGELOG      |  1 +
 Makefile       | 19 ++++++++++++++-----
 README.md      |  7 ++++---
 isodumper.spec | 11 +++++++----
 4 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index c652bed..44ac36b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@ IsoDumper 0.20
 ------------
 	  - added function to backup the content of the device before overwriting.
 	  - added Release number in the window title (on isodumper.py).
+	  - use mageia polkit policy instead of usermode.
 	  - added and update Estonian translations.
 	  - updated  de,fr,id,ro,sl,sv,zh_TW,tr,uk,pt_BR,ru,es and it translations.
 	  
diff --git a/Makefile b/Makefile
index 9136c67..a945b76 100644
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,8 @@ PREFIX=/usr/local
 BINDIR=$(PREFIX)/bin
 SBINDIR=$(PREFIX)/sbin
 LIBDIR=$(PREFIX)/lib
+LIBEXECDIR=$(PREFIX)/libexec
+POLKITPOLICYDIR=$(PREFIX)/share/polkit-1/actions
 DATADIR=$(PREFIX)/share
 ICONSDIR=$(PREFIX)/share/icons
 PIXMAPSDIR=$(PREFIX)/share/pixmaps
@@ -34,12 +36,19 @@ clean:
 
 install: all
 
-	# for binary file isodumper on /usr/sbin/
-	mkdir -p $(DESTDIR)$(SBINDIR)
-	install -m 755 isodumper $(DESTDIR)$(SBINDIR)
-	# Adjust for console-helper magic
+	# for binary file script isodumper on /usr/libexec/
+	mkdir -p $(DESTDIR)$(LIBEXECDIR)
+	install -m 755 isodumper $(DESTDIR)$(LIBEXECDIR)
+
+	# for binary file isodumper on /usr/bin/ 
+	# to have authentication with polkit (use for mageia policy)
 	mkdir -p $(DESTDIR)$(BINDIR)
-	cd $(DESTDIR)$(BINDIR); ln -s consolehelper isodumper
+	install -m 755 bin/isodumper $(DESTDIR)$(BINDIR)
+
+	# 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)
 
 	# for LIBFILES isodumper.py find_devices
 	mkdir -p $(DESTDIR)$(LIBDIR)/isodumper
diff --git a/README.md b/README.md
index 945f8f7..608b9a3 100644
--- a/README.md
+++ b/README.md
@@ -8,12 +8,13 @@ Requirements
 -------------
 
 - coreutils
-- udisks
+- pango
+- polkit
 - procps
+- pygtk2.0-libglade
 - python
+- udisks
 - xterm
-- pygtk2.0-libglade
-- usermode-consoleonly
 
 
 License
diff --git a/isodumper.spec b/isodumper.spec
index 927f9e0..2d4310a 100644
--- a/isodumper.spec
+++ b/isodumper.spec
@@ -13,12 +13,14 @@ BuildArch:	noarch
 BuildRequires:	imagemagick
 
 Requires:	coreutils
-Requires:	udisks
+Requires:	pango
+Requires:	polkit
 Requires:	procps
+Requires:	pygtk2.0-libglade
 Requires:	python
+Requires:	udisks
 Requires:	xterm
-Requires:	pygtk2.0-libglade
-Requires:	usermode-consoleonly
+
 
 %description
 A GUI tool for writing ISO images on a USB stick.
@@ -46,10 +48,11 @@ Ce logiciel est écrit en python.
 
 %files -f %{name}.lang
 %doc COPYING CHANGELOG
-%{_sbindir}/%{name}
 %{_bindir}/%{name}
+%{_libexecdir}/%{name}
 %{_usr}/lib/%{name}/
 %{_datadir}/%{name}/
+%{_datadir}/polkit-1/actions/*.policy
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
 %{_miconsdir}/%{name}.png
-- 
cgit v1.2.1