Skip to content

Commit c7fcbc4

Browse files
JajcusJajcus
committed
fix 'test_user_similar' fail
fixes: > FAIL: test_user_similar (test.test_sysconfig.TestSysConfig)
1 parent e0b2c81 commit c7fcbc4

2 files changed

Lines changed: 41 additions & 26 deletions

File tree

‎python3-multilib.patch‎

Lines changed: 40 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
diff -durN -x '*~' -x '*.orig' Python-3.5.0.orig/Include/pylifecycle.h Python-3.5.0/Include/pylifecycle.h
1+
diff -dur Python-3.5.0.orig/Include/pylifecycle.h Python-3.5.0/Include/pylifecycle.h
22
--- Python-3.5.0.orig/Include/pylifecycle.h 2015-09-13 13:41:20.000000000 +0200
3-
+++ Python-3.5.0/Include/pylifecycle.h 2015-12-02 20:55:26.865642310 +0100
3+
+++ Python-3.5.0/Include/pylifecycle.h 2015-12-03 17:31:03.874280444 +0100
44
@@ -65,6 +65,8 @@
55
/* In their own files */
66
PyAPI_FUNC(const char *) Py_GetVersion(void);
@@ -10,9 +10,9 @@ diff -durN -x '*~' -x '*.orig' Python-3.5.0.orig/Include/pylifecycle.h Python-3.
1010
PyAPI_FUNC(const char *) Py_GetCopyright(void);
1111
PyAPI_FUNC(const char *) Py_GetCompiler(void);
1212
PyAPI_FUNC(const char *) Py_GetBuildInfo(void);
13-
diff -durN -x '*~' -x '*.orig' Python-3.5.0.orig/Lib/distutils/command/install.py Python-3.5.0/Lib/distutils/command/install.py
13+
diff -dur Python-3.5.0.orig/Lib/distutils/command/install.py Python-3.5.0/Lib/distutils/command/install.py
1414
--- Python-3.5.0.orig/Lib/distutils/command/install.py 2015-09-13 13:41:20.000000000 +0200
15-
+++ Python-3.5.0/Lib/distutils/command/install.py 2015-12-02 20:55:26.865642310 +0100
15+
+++ Python-3.5.0/Lib/distutils/command/install.py 2015-12-03 17:31:03.874280444 +0100
1616
@@ -19,6 +19,8 @@
1717
from site import USER_SITE
1818
HAS_USER_SITE = True
@@ -42,9 +42,9 @@ diff -durN -x '*~' -x '*.orig' Python-3.5.0.orig/Lib/distutils/command/install.p
4242
'headers': '$base/include/python/$dist_name',
4343
'scripts': '$base/bin',
4444
'data' : '$base',
45-
diff -durN -x '*~' -x '*.orig' Python-3.5.0.orig/Lib/distutils/sysconfig.py Python-3.5.0/Lib/distutils/sysconfig.py
45+
diff -dur Python-3.5.0.orig/Lib/distutils/sysconfig.py Python-3.5.0/Lib/distutils/sysconfig.py
4646
--- Python-3.5.0.orig/Lib/distutils/sysconfig.py 2015-09-13 13:41:21.000000000 +0200
47-
+++ Python-3.5.0/Lib/distutils/sysconfig.py 2015-12-02 20:55:26.868975666 +0100
47+
+++ Python-3.5.0/Lib/distutils/sysconfig.py 2015-12-03 17:31:03.874280444 +0100
4848
@@ -132,8 +132,12 @@
4949
prefix = plat_specific and EXEC_PREFIX or PREFIX
5050

@@ -59,9 +59,9 @@ diff -durN -x '*~' -x '*.orig' Python-3.5.0.orig/Lib/distutils/sysconfig.py Pyth
5959
if standard_lib:
6060
return libpython
6161
else:
62-
diff -durN -x '*~' -x '*.orig' Python-3.5.0.orig/Lib/distutils/tests/test_install.py Python-3.5.0/Lib/distutils/tests/test_install.py
62+
diff -dur Python-3.5.0.orig/Lib/distutils/tests/test_install.py Python-3.5.0/Lib/distutils/tests/test_install.py
6363
--- Python-3.5.0.orig/Lib/distutils/tests/test_install.py 2015-09-13 13:41:21.000000000 +0200
64-
+++ Python-3.5.0/Lib/distutils/tests/test_install.py 2015-12-02 20:55:26.868975666 +0100
64+
+++ Python-3.5.0/Lib/distutils/tests/test_install.py 2015-12-03 17:31:03.874280444 +0100
6565
@@ -55,7 +55,7 @@
6666
expected = os.path.normpath(expected)
6767
self.assertEqual(got, expected)
@@ -71,9 +71,9 @@ diff -durN -x '*~' -x '*.orig' Python-3.5.0.orig/Lib/distutils/tests/test_instal
7171
check_path(cmd.install_lib, libdir)
7272
check_path(cmd.install_platlib, libdir)
7373
check_path(cmd.install_purelib, libdir)
74-
diff -durN -x '*~' -x '*.orig' Python-3.5.0.orig/Lib/site.py Python-3.5.0/Lib/site.py
74+
diff -dur Python-3.5.0.orig/Lib/site.py Python-3.5.0/Lib/site.py
7575
--- Python-3.5.0.orig/Lib/site.py 2015-09-13 13:41:21.000000000 +0200
76-
+++ Python-3.5.0/Lib/site.py 2015-12-02 20:55:26.868975666 +0100
76+
+++ Python-3.5.0/Lib/site.py 2015-12-03 17:31:03.874280444 +0100
7777
@@ -303,12 +303,16 @@
7878
seen.add(prefix)
7979

@@ -93,9 +93,9 @@ diff -durN -x '*~' -x '*.orig' Python-3.5.0.orig/Lib/site.py Python-3.5.0/Lib/si
9393
if sys.platform == "darwin":
9494
# for framework builds *only* we add the standard Apple
9595
# locations.
96-
diff -durN -x '*~' -x '*.orig' Python-3.5.0.orig/Lib/sysconfig.py Python-3.5.0/Lib/sysconfig.py
96+
diff -dur Python-3.5.0.orig/Lib/sysconfig.py Python-3.5.0/Lib/sysconfig.py
9797
--- Python-3.5.0.orig/Lib/sysconfig.py 2015-09-13 13:41:21.000000000 +0200
98-
+++ Python-3.5.0/Lib/sysconfig.py 2015-12-02 20:56:37.266116742 +0100
98+
+++ Python-3.5.0/Lib/sysconfig.py 2015-12-03 17:31:51.974741432 +0100
9999
@@ -20,10 +20,10 @@
100100

101101
_INSTALL_SCHEMES = {
@@ -126,6 +126,21 @@ diff -durN -x '*~' -x '*.orig' Python-3.5.0.orig/Lib/sysconfig.py Python-3.5.0/L
126126
'include': '{installed_base}/include/python',
127127
'platinclude': '{installed_base}/include/python',
128128
'scripts': '{base}/bin',
129+
@@ -61,10 +61,10 @@
130+
'data': '{userbase}',
131+
},
132+
'posix_user': {
133+
- 'stdlib': '{userbase}/lib/python{py_version_short}',
134+
- 'platstdlib': '{userbase}/lib/python{py_version_short}',
135+
- 'purelib': '{userbase}/lib/python{py_version_short}/site-packages',
136+
- 'platlib': '{userbase}/lib/python{py_version_short}/site-packages',
137+
+ 'stdlib': '{userbase}/' + sys.lib + '/python{py_version_short}',
138+
+ 'platstdlib': '{userbase}/' + sys.lib + '/python{py_version_short}',
139+
+ 'purelib': '{userbase}/' + sys.lib + '/python{py_version_short}/site-packages',
140+
+ 'platlib': '{userbase}/' + sys.lib + '/python{py_version_short}/site-packages',
141+
'include': '{userbase}/include/python{py_version_short}',
142+
'scripts': '{userbase}/bin',
143+
'data': '{userbase}',
129144
@@ -459,7 +459,11 @@
130145
else:
131146
inc_dir = _sys_home or _PROJECT_BASE
@@ -139,9 +154,9 @@ diff -durN -x '*~' -x '*.orig' Python-3.5.0.orig/Lib/sysconfig.py Python-3.5.0/L
139154
return os.path.join(inc_dir, 'pyconfig.h')
140155

141156

142-
diff -durN -x '*~' -x '*.orig' Python-3.5.0.orig/Makefile.pre.in Python-3.5.0/Makefile.pre.in
157+
diff -dur Python-3.5.0.orig/Makefile.pre.in Python-3.5.0/Makefile.pre.in
143158
--- Python-3.5.0.orig/Makefile.pre.in 2015-09-13 13:41:23.000000000 +0200
144-
+++ Python-3.5.0/Makefile.pre.in 2015-12-02 20:55:26.868975666 +0100
159+
+++ Python-3.5.0/Makefile.pre.in 2015-12-03 17:31:03.874280444 +0100
145160
@@ -101,6 +101,8 @@
146161

147162
# Machine-dependent subdirectories
@@ -180,9 +195,9 @@ diff -durN -x '*~' -x '*.orig' Python-3.5.0.orig/Makefile.pre.in Python-3.5.0/Ma
180195
fi; \
181196
else \
182197
echo Skip install of $(LIBRARY) - use make frameworkinstall; \
183-
diff -durN -x '*~' -x '*.orig' Python-3.5.0.orig/Modules/getpath.c Python-3.5.0/Modules/getpath.c
198+
diff -dur Python-3.5.0.orig/Modules/getpath.c Python-3.5.0/Modules/getpath.c
184199
--- Python-3.5.0.orig/Modules/getpath.c 2015-09-13 13:41:24.000000000 +0200
185-
+++ Python-3.5.0/Modules/getpath.c 2015-12-02 20:55:26.868975666 +0100
200+
+++ Python-3.5.0/Modules/getpath.c 2015-12-03 17:31:03.874280444 +0100
186201
@@ -117,9 +117,21 @@
187202
#define EXEC_PREFIX PREFIX
188203
#endif
@@ -225,9 +240,9 @@ diff -durN -x '*~' -x '*.orig' Python-3.5.0.orig/Modules/getpath.c Python-3.5.0/
225240
bufsz = wcslen(zip_path); /* Replace "00" with version */
226241
zip_path[bufsz - 6] = VERSION[0];
227242
zip_path[bufsz - 5] = VERSION[2];
228-
diff -durN -x '*~' -x '*.orig' Python-3.5.0.orig/Python/getplatform.c Python-3.5.0/Python/getplatform.c
243+
diff -dur Python-3.5.0.orig/Python/getplatform.c Python-3.5.0/Python/getplatform.c
229244
--- Python-3.5.0.orig/Python/getplatform.c 2015-09-13 13:41:26.000000000 +0200
230-
+++ Python-3.5.0/Python/getplatform.c 2015-12-02 20:55:26.868975666 +0100
245+
+++ Python-3.5.0/Python/getplatform.c 2015-12-03 17:31:03.874280444 +0100
231246
@@ -10,3 +10,23 @@
232247
{
233248
return PLATFORM;
@@ -252,9 +267,9 @@ diff -durN -x '*~' -x '*.orig' Python-3.5.0.orig/Python/getplatform.c Python-3.5
252267
+{
253268
+ return LIB;
254269
+}
255-
diff -durN -x '*~' -x '*.orig' Python-3.5.0.orig/Python/sysmodule.c Python-3.5.0/Python/sysmodule.c
270+
diff -dur Python-3.5.0.orig/Python/sysmodule.c Python-3.5.0/Python/sysmodule.c
256271
--- Python-3.5.0.orig/Python/sysmodule.c 2015-09-13 13:41:26.000000000 +0200
257-
+++ Python-3.5.0/Python/sysmodule.c 2015-12-02 20:55:26.868975666 +0100
272+
+++ Python-3.5.0/Python/sysmodule.c 2015-12-03 17:31:03.874280444 +0100
258273
@@ -1767,6 +1767,10 @@
259274
PyUnicode_FromString(Py_GetCopyright()));
260275
SET_SYS_FROM_STRING("platform",
@@ -266,9 +281,9 @@ diff -durN -x '*~' -x '*.orig' Python-3.5.0.orig/Python/sysmodule.c Python-3.5.0
266281
SET_SYS_FROM_STRING("executable",
267282
PyUnicode_FromWideChar(
268283
Py_GetProgramFullPath(), -1));
269-
diff -durN -x '*~' -x '*.orig' Python-3.5.0.orig/configure.ac Python-3.5.0/configure.ac
270-
--- Python-3.5.0.orig/configure.ac 2015-12-02 20:54:45.102025846 +0100
271-
+++ Python-3.5.0/configure.ac 2015-12-02 20:55:26.868975666 +0100
284+
diff -dur Python-3.5.0.orig/configure.ac Python-3.5.0/configure.ac
285+
--- Python-3.5.0.orig/configure.ac 2015-12-03 17:30:32.777292009 +0100
286+
+++ Python-3.5.0/configure.ac 2015-12-03 17:31:03.877613811 +0100
272287
@@ -722,6 +722,45 @@
273288
])
274289
fi
@@ -324,9 +339,9 @@ diff -durN -x '*~' -x '*.orig' Python-3.5.0.orig/configure.ac Python-3.5.0/confi
324339
AC_SUBST(LIBPL)
325340

326341
# Check whether right shifting a negative integer extends the sign bit
327-
diff -durN -x '*~' -x '*.orig' Python-3.5.0.orig/setup.py Python-3.5.0/setup.py
342+
diff -dur Python-3.5.0.orig/setup.py Python-3.5.0/setup.py
328343
--- Python-3.5.0.orig/setup.py 2015-09-13 13:41:26.000000000 +0200
329-
+++ Python-3.5.0/setup.py 2015-12-02 20:55:26.872309022 +0100
344+
+++ Python-3.5.0/setup.py 2015-12-03 17:31:03.877613811 +0100
330345
@@ -526,8 +526,7 @@
331346
# be assumed that no additional -I,-L directives are needed.
332347
if not cross_compiling:

‎python3.spec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Summary(tr.UTF-8): X arayüzlü, yüksek düzeyli, kabuk yorumlayıcı dili
3434
Summary(uk.UTF-8): Мова програмування дуже високого рівня з X-інтерфейсом
3535
Name: python3
3636
Version: %{py_ver}.0
37-
Release: 6.2
37+
Release: 6.3
3838
Epoch: 1
3939
License: PSF
4040
Group: Applications

0 commit comments

Comments
 (0)