From 6d33892fe017a82dff1238fef6eb7f63bd838b40 Mon Sep 17 00:00:00 2001
From: Mikhail Novosyolov <mikhailnov@nixtux.ru>
Date: Fri, 22 Apr 2022 18:33:36 +0300
Subject: [PATCH] student-connect: fix typos

---
 .gear/doskast.spec                   | 4 +---
 Makefile                             | 2 +-
 ru.mos.doskast-student-config.policy | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.gear/doskast.spec b/.gear/doskast.spec
index a0571be..11f5949 100644
--- a/.gear/doskast.spec
+++ b/.gear/doskast.spec
@@ -38,9 +38,9 @@ Requires(pre): apache2-base
 Summary: Doskast for client (student)
 Group: Graphical desktop/Other
 Requires: curl
-Requires: polkit
 Requires: xpra
 Requires: zenity
+Requires: %{_bindir}/pkexec
 
 %description student
 %summary
@@ -54,11 +54,9 @@ Requires: zenity
 %config(noreplace) %{_sysconfdir}/doskastrc
 
 %post student
-%post_service doskast-student.socket
 %post_service doskast-student.service
 
 %preun student
-%preun_service doskast-student.socket
 %preun_service doskast-student.service
 
 #--------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 9e7846d..0aade25 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ install:
 	mkdir -p --mode=0755 $(DESTDIR)$(SBINDIR)
 	install -m0755 doskast-server-watcher.sh $(DESTDIR)$(BINDIR)/doskast-server-watcher
 	install -m0755 doskast-student-config.sh $(DESTDIR)$(SBINDIR)/doskast-student-config
-	echo -e '#!/bin/sh\n$(BINDIR)/doskast-student-config "$$@"' > $(DESTDIR)$(BINDIR)/doskast-student-config
+	echo -e '#!/bin/sh\npkexec $(SBINDIR)/doskast-student-config "$$@"' > $(DESTDIR)$(BINDIR)/doskast-student-config
 	chmod 0755 $(DESTDIR)$(BINDIR)/doskast-student-config
 
 	mkdir -p --mode=0755 $(DESTDIR)$(SYSCONFDIR)/xdg/autostart
diff --git a/ru.mos.doskast-student-config.policy b/ru.mos.doskast-student-config.policy
index 841158f..314dc40 100644
--- a/ru.mos.doskast-student-config.policy
+++ b/ru.mos.doskast-student-config.policy
@@ -15,7 +15,7 @@
 <allow_inactive>auth_admin</allow_inactive>
 <allow_active>auth_admin</allow_active>
 </defaults>
-<annotate key="org.freedesktop.policykit.exec.path">/usr/sbin/doskast-student-setup</annotate>
+<annotate key="org.freedesktop.policykit.exec.path">/usr/sbin/doskast-student-config</annotate>
 <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
 </action>
 </policyconfig>