From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sat, 9 Sep 2023 10:51:04 +0000 (+0200)
Subject: - swith all scripts to python 3, rel 2
X-Git-Tag: auto/th/cifs-utils-7.0-2
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=3ee423deeba407f16323d79ddfbd6a338c2b3bf3;hp=e305a3d1848e92ff5ea587a2aea7dd1ed086df0d;p=packages%2Fcifs-utils.git

- swith all scripts to python 3, rel 2
---

diff --git a/cifs-utils.spec b/cifs-utils.spec
index 3dac809..1c64895 100644
--- a/cifs-utils.spec
+++ b/cifs-utils.spec
@@ -2,12 +2,13 @@ Summary:	Utilities for mounting and managing CIFS mounts
 Summary(pl.UTF-8):	Narzędzia do montowania i zarządzania montowaniami CIFS
 Name:		cifs-utils
 Version:	7.0
-Release:	1
+Release:	2
 License:	GPL v3+
 Group:		Daemons
 Source0:	https://ftp.samba.org/pub/linux-cifs/cifs-utils/%{name}-%{version}.tar.bz2
 # Source0-md5:	518431bf43f23e6aacd97e80e2060df7
 Patch0:		%{name}-heimdal.patch
+Patch1:		python3.patch
 URL:		https://wiki.samba.org/index.php/LinuxCIFS_utils
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
@@ -55,12 +56,12 @@ Plik nagłówkowy interfejsu wtyczek ID Mapping cifs-utils.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
-%{__sed} -i -e '1s,/usr/bin/env python$,%{__python},' \
+%{__sed} -i -e '1s,/usr/bin/env python$,%{__python3},' \
+	-e '1s,/usr/bin/env python3,%{__python3},' \
 	smb2-quota \
-	smb2-secdesc
-
-%{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' \
+	smb2-secdesc \
 	checkopts \
 	smbinfo
 
diff --git a/python3.patch b/python3.patch
new file mode 100644
index 0000000..585aab0
--- /dev/null
+++ b/python3.patch
@@ -0,0 +1,20 @@
+--- cifs-utils-7.0/smb2-secdesc.orig	2023-09-09 12:42:49.000000000 +0200
++++ cifs-utils-7.0/smb2-secdesc	2023-09-09 12:48:13.717223739 +0200
+@@ -8,7 +8,7 @@
+ import struct
+ import stat
+ import sys
+-from Tkinter import *
++from tkinter import *
+ 
+ FULL_CONTROL = 0x001f01ff
+ EWRITE = 0x00000116
+@@ -297,7 +297,7 @@
+ CIFS_QUERY_INFO = 0xc018cf07
+ 
+ def usage():
+-	print "Usage: %s <filename>" % (sys.argv[0])
++	print("Usage: %s <filename>" % (sys.argv[0]))
+ 	sys.exit()
+ 
+