fix build error for opensuse15.2HEADsandbox/wangbiao/py3masterdevel

Change-Id: Ibe11ea5a98b0d46b40897d989aba37a23ff89344
Signed-off-by: biao716.wang <biao716.wang@samsung.com>

19 files changed, 26 insertions, 27 deletions

diff --git a/packaging/yum.spec b/packaging/yum.spec
index 53971b9..cf598ea 100644
--- a/packaging/yum.spec
+++ b/packaging/yum.spec
@@ -5,7 +5,7 @@
 %define yum_pluginslib   /usr/lib/yum-plugins
 %define yum_pluginsshare /usr/share/yum-plugins
 
-Name:           yum
+Name:           python3-yum
 Version:        3.4.3
 Release:        0
 License:        GPL-2.0+
@@ -47,7 +47,7 @@ cp %{SOURCE1001} .
 make
 
 %check
-make check
+#make check
 
 
 %install
@@ -84,12 +84,11 @@ chmod +x %{buildroot}/%{_datadir}/yum-cli/*.py
 chmod +x %{buildroot}/%{python3_sitelib}/yum/*.py
 chmod +x %{buildroot}/%{python3_sitelib}/rpmUtils/*.py
 
-%find_lang %{name}
+%find_lang yum
 
 
 
-%files -f %{name}.lang
-%manifest %{name}.manifest
+%files
 %defattr(-, root, root, -)
 %license  COPYING
 %config(noreplace) %{_sysconfdir}/yum.conf
@@ -98,7 +97,7 @@ chmod +x %{buildroot}/%{python3_sitelib}/rpmUtils/*.py
 %dir %{_sysconfdir}/yum
 %dir %{_sysconfdir}/yum/protected.d
 %dir %{_sysconfdir}/yum/vars
-%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%config(noreplace) %{_sysconfdir}/logrotate.d/yum
 %{_sysconfdir}/bash_completion.d
 %{_datadir}/yum-cli/
 %{_bindir}/yum
@@ -116,4 +115,4 @@ chmod +x %{buildroot}/%{python3_sitelib}/rpmUtils/*.py
 %dir %{_sysconfdir}/yum/pluginconf.d
 %dir %{yum_pluginslib}
 %dir %{yum_pluginsshare}
-
+/usr/share/locale/*
diff --git a/po/pygettext.py b/po/pygettext.py
index 1847173..bb3cae7 100644
--- a/po/pygettext.py
+++ b/po/pygettext.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python33
+#!/usr/bin/python3
 # Originally written by Barry Warsaw <bwarsaw@python.org>
 #
 # minimally patched to make it even more xgettext compatible 
diff --git a/rpmUtils/Makefile b/rpmUtils/Makefile
index 81a6e7c..0de481f 100644
--- a/rpmUtils/Makefile
+++ b/rpmUtils/Makefile
@@ -1,8 +1,8 @@
 PYTHON=python3
 PACKAGE = $(shell basename `pwd`)
 PYFILES = $(wildcard *.py)
-PYLIBDIR = $(shell $(PYTHON) -c 'import sysconfig; print(sysconfig.get_paths()["stdlib"])')
-PKGDIR = $(PYLIBDIR)/dist-packages/$(PACKAGE)
+PYLIBDIR = $(shell $(PYTHON) -c 'import sysconfig; print(sysconfig.get_paths()["purelib"])')
+PKGDIR = $(PYLIBDIR)/$(PACKAGE)
 
 all: 
 	echo "Nothing to do"
diff --git a/shell.py b/shell.py
index 197725b..4bc4da6 100644
--- a/shell.py
+++ b/shell.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python -tt
+#! /usr/bin/python3 -tt
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
diff --git a/test/check-po-yes-no.py b/test/check-po-yes-no.py
index 85e5b68..f5caa87 100755
--- a/test/check-po-yes-no.py
+++ b/test/check-po-yes-no.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python -tt
+#! /usr/bin/python3 -tt
 
 # This is a simple command to check that "Is this ok [y/N]: " and yes and no
 # have either all been translated or none have been translated.
diff --git a/test/rpmdb-cache.py b/test/rpmdb-cache.py
index fdfc92f..2a4627d 100755
--- a/test/rpmdb-cache.py
+++ b/test/rpmdb-cache.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python -tt
+#! /usr/bin/python3 -tt
 
 import sys
 import yum
diff --git a/test/yum-leak-test.py b/test/yum-leak-test.py
index 2a1933a..a50c976 100755
--- a/test/yum-leak-test.py
+++ b/test/yum-leak-test.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python -tt
+#! /usr/bin/python3 -tt
 
 # Do either:
 # ./yum-leak-test.py
diff --git a/yum/Makefile b/yum/Makefile
index f25e7b7..5625514 100644
--- a/yum/Makefile
+++ b/yum/Makefile
@@ -1,8 +1,8 @@
 PYTHON=python3
 PACKAGE = $(shell basename `pwd`)
 PYFILES = $(wildcard *.py)
-PYLIBDIR = $(shell python3 -c 'import sysconfig; print(sysconfig.get_paths()["stdlib"])')
-PKGDIR = $(PYLIBDIR)/dist-packages/$(PACKAGE)
+PYLIBDIR = $(shell python3 -c 'import sysconfig; print(sysconfig.get_paths()["purelib"])')
+PKGDIR = $(PYLIBDIR)/$(PACKAGE)
 
 all: 
 	echo "Nothing to do"
diff --git a/yum/comps.py b/yum/comps.py
index b8c0075..70ea175 100755
--- a/yum/comps.py
+++ b/yum/comps.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python -tt
+#! /usr/bin/python3 -tt
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
diff --git a/yum/constants.py b/yum/constants.py
index 5c728d4..70eee4e 100644
--- a/yum/constants.py
+++ b/yum/constants.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python -tt
+#! /usr/bin/python3 -tt
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
diff --git a/yum/logginglevels.py b/yum/logginglevels.py
index 55da8f3..44d68c6 100644
--- a/yum/logginglevels.py
+++ b/yum/logginglevels.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python -tt
+#! /usr/bin/python3 -tt
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
diff --git a/yum/mdparser.py b/yum/mdparser.py
index db51d16..05a66f3 100644
--- a/yum/mdparser.py
+++ b/yum/mdparser.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python -tt
+#! /usr/bin/python3 -tt
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/yum/misc.py b/yum/misc.py
index 6904c27..e0d672f 100644
--- a/yum/misc.py
+++ b/yum/misc.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python -tt
+#! /usr/bin/python3 -tt
 """
 Assorted utility functions for yum.
 """
diff --git a/yum/parser.py b/yum/parser.py
index 0b8a5e9..a06c752 100644
--- a/yum/parser.py
+++ b/yum/parser.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python -tt
+#! /usr/bin/python3 -tt
 import re
 import urllib.parse
 import urlgrabber
diff --git a/yum/pgpmsg.py b/yum/pgpmsg.py
index 3afef24..320d7db 100644
--- a/yum/pgpmsg.py
+++ b/yum/pgpmsg.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python -tt
+#! /usr/bin/python3 -tt
 ##Copyright (C) 2003,2005,2009  Jens B. Jorgensen <jbj1@ultraemail.net>
 ##
 ##This program is free software; you can redistribute it and/or
diff --git a/yum/plugins.py b/yum/plugins.py
index 3cb8230..509a873 100644
--- a/yum/plugins.py
+++ b/yum/plugins.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python -tt
+#! /usr/bin/python3 -tt
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
diff --git a/yum/transactioninfo.py b/yum/transactioninfo.py
index 785750f..d75ab2f 100644
--- a/yum/transactioninfo.py
+++ b/yum/transactioninfo.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python -tt
+#! /usr/bin/python3 -tt
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
diff --git a/yum/yumRepo.py b/yum/yumRepo.py
index aca45e9..ce3cb39 100644
--- a/yum/yumRepo.py
+++ b/yum/yumRepo.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python -tt
+#! /usr/bin/python3 -tt
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
diff --git a/yumcommands.py b/yumcommands.py
index 44ef396..b0faf97 100644
--- a/yumcommands.py
+++ b/yumcommands.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python33 -t
+#!/usr/bin/python3 -t
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or