From c4571c40226bb8edcb8b0a5c649f5124fcde3a44c2861bd66bf2ab92d595d895 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Sat, 30 Sep 2017 09:19:10 +0000
Subject: [PATCH] drops: rpmlint-deps.patch - Switch to Python 3.x

OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint-mini?expand=0&rev=65
---
 rpmlint-deps.patch   |  63 -------------
 rpmlint-deps.txt     | 209 ++++++++++++++++++++++---------------------
 rpmlint-mini.changes |   2 +
 rpmlint-mini.spec    |  33 +++----
 rpmlint.wrapper      |   2 +-
 5 files changed, 120 insertions(+), 189 deletions(-)
 delete mode 100644 rpmlint-deps.patch

diff --git a/rpmlint-deps.patch b/rpmlint-deps.patch
deleted file mode 100644
index e69b3eb..0000000
--- a/rpmlint-deps.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Index: rpmlint-deps.txt
-===================================================================
---- rpmlint-deps.txt
-+++ rpmlint-deps.txt
-@@ -166,16 +166,55 @@
- sitecustomize.so
- sitemodule.so
- site-packages
-+site-packages/construct/__init__.py
-+site-packages/construct/adapters.py
- site-packages/construct/core.py
- site-packages/construct/debug.py
--site-packages/construct/expr.py
--site-packages/construct/__init__.py
-+site-packages/construct/formats/__init__.py
-+site-packages/construct/formats/data/__init__.py
-+site-packages/construct/formats/data/cap.py
-+site-packages/construct/formats/data/snoop.py
-+site-packages/construct/formats/executable/__init__.py
-+site-packages/construct/formats/executable/elf32.py
-+site-packages/construct/formats/executable/pe32.py
-+site-packages/construct/formats/filesystem/__init__.py
-+site-packages/construct/formats/filesystem/ext2.py
-+site-packages/construct/formats/filesystem/fat16.py
-+site-packages/construct/formats/filesystem/mbr.py
-+site-packages/construct/formats/graphics/__init__.py
-+site-packages/construct/formats/graphics/bmp.py
-+site-packages/construct/formats/graphics/emf.py
-+site-packages/construct/formats/graphics/gif.py
-+site-packages/construct/formats/graphics/png.py
-+site-packages/construct/formats/graphics/wmf.py
-+site-packages/construct/lib/__init__.py
- site-packages/construct/lib/binary.py
- site-packages/construct/lib/bitstream.py
- site-packages/construct/lib/container.py
-+site-packages/construct/lib/expr.py
- site-packages/construct/lib/hex.py
--site-packages/construct/lib/__init__.py
- site-packages/construct/lib/py3compat.py
-+site-packages/construct/macros.py
-+site-packages/construct/protocols/__init__.py
-+site-packages/construct/protocols/application/__init__.py
-+site-packages/construct/protocols/application/dns.py
-+site-packages/construct/protocols/ipstack.py
-+site-packages/construct/protocols/layer2/__init__.py
-+site-packages/construct/protocols/layer2/arp.py
-+site-packages/construct/protocols/layer2/ethernet.py
-+site-packages/construct/protocols/layer2/mtp2.py
-+site-packages/construct/protocols/layer3/__init__.py
-+site-packages/construct/protocols/layer3/dhcpv4.py
-+site-packages/construct/protocols/layer3/dhcpv6.py
-+site-packages/construct/protocols/layer3/icmpv4.py
-+site-packages/construct/protocols/layer3/igmpv2.py
-+site-packages/construct/protocols/layer3/ipv4.py
-+site-packages/construct/protocols/layer3/ipv6.py
-+site-packages/construct/protocols/layer3/mtp3.py
-+site-packages/construct/protocols/layer4/__init__.py
-+site-packages/construct/protocols/layer4/isup.py
-+site-packages/construct/protocols/layer4/tcp.py
-+site-packages/construct/protocols/layer4/udp.py
- site-packages/construct/version.py
- site-packages/pybeam/__init__.py
- site-packages/pybeam/beam_construct.py
diff --git a/rpmlint-deps.txt b/rpmlint-deps.txt
index 59df06c..86088f1 100644
--- a/rpmlint-deps.txt
+++ b/rpmlint-deps.txt
@@ -1,37 +1,37 @@
-_abcoll.pyo
-abc.pyo
-base64.pyo
+_abcoll.cpython-36.opt-1.pyc
+abc.cpython-36.opt-1.pyc
+base64.cpython-36.opt-1.pyc
 binasciimodule.so
-binascii.pyo
+binascii.cpython-36.opt-1.pyc
 binascii.so
-bisect.pyo
-calendar.pyo
+bisect.cpython-36.opt-1.pyc
+calendar.cpython-36.opt-1.pyc
 codecsmodule.so
-codecs.pyo
+codecs.cpython-36.opt-1.pyc
 codecs.so
-collections.pyo
+collections.cpython-36.opt-1.pyc
 commandsmodule.so
-commands.pyo
+commands.cpython-36.opt-1.pyc
 commands.so
-contextlib.pyo
-ConfigParser.pyo
-copy.pyo
+contextlib.cpython-36.opt-1.pyc
+ConfigParser.cpython-36.opt-1.pyc
+copy.cpython-36.opt-1.pyc
 copy_regmodule.so
-copy_reg.pyo
+copy_reg.cpython-36.opt-1.pyc
 copy_reg.so
-ctypes/__init__.pyo
-ctypes/_endian.pyo
-ctypes/util.pyo
-ctypes/wintypes.pyo
+ctypes/__init__.cpython-36.opt-1.pyc
+ctypes/_endian.cpython-36.opt-1.pyc
+ctypes/util.cpython-36.opt-1.pyc
+ctypes/wintypes.cpython-36.opt-1.pyc
 cStringIOmodule.so
-cStringIO.pyo
+cStringIO.cpython-36.opt-1.pyc
 cStringIO.so
 datetime.so
 encodings/aliasesmodule.so
-encodings/aliases.pyo
+encodings/__pycache__/aliases.cpython-36.opt-1.pyc
 encodings/aliases.so
 encodings/asciimodule.so
-encodings/ascii.pyo
+encodings/__pycache__/ascii.cpython-36.opt-1.pyc
 encodings/ascii.so
 encodings/codecsmodule.so
 encodings/codecs.pyo
@@ -42,9 +42,9 @@ encodings/encodings.so
 encodings/__init__module.so
 encodings/__init__.pyo
 encodings/__init__.so
-encodings/iso8859_1.pyo
-encodings/latin_1.pyo
-encodings/string_escape.pyo
+encodings/__pycache__/iso8859_1.cpython-36.opt-1.pyc
+encodings/__pycache__/latin_1.cpython-36.opt-1.pyc
+encodings/__pycache__/string_escape.cpython-36.opt-1.pyc
 encodings/typesmodule.so
 encodings/types.pyo
 encodings/types.so
@@ -52,26 +52,27 @@ encodings/utf_8.pyo
 encodings/zlib_codec.pyo
 fcntl.so
 fnmatchmodule.so
-fnmatch.pyo
+fnmatch.cpython-36.opt-1.pyc
 fnmatch.so
-functools.pyo
-__future__.pyo
-genericpath.pyo
+functools.cpython-36.opt-1.pyc
+__future__.cpython-36.opt-1.pyc
+genericpath.cpython-36.opt-1.pyc
 getoptmodule.so
-getopt.pyo
+getopt.cpython-36.opt-1.pyc
 getopt.so
 globmodule.so
-glob.pyo
+glob.cpython-36.opt-1.pyc
 glob.so
-hashlib.pyo
-heapq.pyo
-httplib.pyo
-io.pyo
-keyword.pyo
+hashlib.cpython-36.opt-1.pyc
+heapq.cpython-36.opt-1.pyc
+httplib.cpython-36.opt-1.pyc
+io.cpython-36.opt-1.pyc
+keyword.cpython-36.opt-1.pyc
 lib-dynload/array.so
 lib-dynload/binascii.so
 lib-dynload/_bisect.so
 lib-dynload/_collections.so
+lib-dynload/cmath.*
 lib-dynload/cStringIO.so
 lib-dynload/_ctypes.so
 lib-dynload/_functools.so
@@ -79,17 +80,18 @@ lib-dynload/_io.so
 lib-dynload/itertools.so
 lib-dynload/_locale.so
 lib-dynload/_md5.so
+lib-dynload/math.*
 lib-dynload/operator.so
 lib-dynload/pyexpat.so
 lib-dynload/rpmmodule.so
-lib-dynload/rpm.pyo
+lib-dynload/rpm.cpython-36.opt-1.pyc
 lib-dynload/rpm.so
 lib-dynload/unicodedata.so
 lib-dynload/_sha256.so
 lib-dynload/_sha512.so
 lib-dynload/_sha.so
 lib-dynload/sitecustomizemodule.so
-lib-dynload/sitecustomize.pyo
+lib-dynload/sitecustomize.cpython-36.opt-1.pyc
 lib-dynload/sitecustomize.so
 lib-dynload/_socket.so
 lib-dynload/strop.so
@@ -98,72 +100,71 @@ lib-dynload/time.so
 lib-dynload/_weakref.so
 lib-dynload/zlib.so
 linecachemodule.so
-linecache.pyo
+linecache.cpython-36.opt-1.pyc
 linecache.so
 _localemodule.so
 localemodule.so
-_locale.pyo
-locale.pyo
+_locale.cpython-36.opt-1.pyc
+locale.cpython-36.opt-1.pyc
 _locale.so
 locale.so
 Makefile
-math.so
-md5.pyo
-mimetools.pyo
+md5.cpython-36.opt-1.pyc
+mimetools.cpython-36.opt-1.pyc
 operatormodule.so
-operator.pyo
+operator.cpython-36.opt-1.pyc
 operator.so
 osmodule.so
-os.pyo
+os.cpython-36.opt-1.pyc
 os.so
-pickle.pyo
+pickle.cpython-36.opt-1.pyc
 plat-linux2/binasciimodule.so
-plat-linux2/binascii.pyo
+plat-linux2/binascii.cpython-36.opt-1.pyc
 plat-linux2/binascii.so
 plat-linux2/cStringIOmodule.so
-plat-linux2/cStringIO.pyo
+plat-linux2/cStringIO.cpython-36.opt-1.pyc
 plat-linux2/cStringIO.so
 plat-linux2/_localemodule.so
-plat-linux2/_locale.pyo
+plat-linux2/_locale.cpython-36.opt-1.pyc
 plat-linux2/_locale.so
 plat-linux2/operatormodule.so
-plat-linux2/operator.pyo
+plat-linux2/operator.cpython-36.opt-1.pyc
 plat-linux2/operator.so
 plat-linux2/rpmmodule.so
-plat-linux2/rpm.pyo
+plat-linux2/rpm.cpython-36.opt-1.pyc
 plat-linux2/rpm.so
 plat-linux2/sitecustomizemodule.so
-plat-linux2/sitecustomize.pyo
+plat-linux2/sitecustomize.cpython-36.opt-1.pyc
 plat-linux2/sitecustomize.so
 plat-linux2/stropmodule.so
-plat-linux2/strop.pyo
+plat-linux2/strop.cpython-36.opt-1.pyc
 plat-linux2/strop.so
 plat-linux2/_structmodule.so
-plat-linux2/_struct.pyo
+plat-linux2/_struct.cpython-36.opt-1.pyc
 plat-linux2/_struct.so
 plat-linux2/timemodule.so
-plat-linux2/time.pyo
+plat-linux2/time.cpython-36.opt-1.pyc
 plat-linux2/time.so
 plat-linux2/zlibmodule.so
-plat-linux2/zlib.pyo
+plat-linux2/zlib.cpython-36.opt-1.pyc
 plat-linux2/zlib.so
 posixpathmodule.so
-posixpath.pyo
+posixpath.cpython-36.opt-1.pyc
 posixpath.so
 pyconfig.h
-random.pyo
+random.cpython-36.opt-1.pyc
 _random.so
 remodule.so
-re.pyo
+re.cpython-36.opt-1.pyc
 re.so
-rfc822.pyo
+rfc822.cpython-36.opt-1.pyc
 rpmmodule.so
-rpm.pyo
+rpm.cpython-36.opt-1.pyc
 rpm.so
 select.so
-shutil.pyo
+shutil.cpython-36.opt-1.pyc
 sitecustomizemodule.so
-sitecustomize.pyo
+sitecustomize.cpython-36.opt-1.pyc
 sitecustomize.so
 sitemodule.so
 site-packages
@@ -184,82 +185,82 @@ site-packages/pybeam/beam_file.py
 site-packages/pybeam/eetf_construct.py
 site-packages/pybeam/erlang_types.py
 site-packages/rpm/__init__module.so
-site-packages/rpm/__init__.pyo
+site-packages/rpm/__init__.cpython-36.opt-1.pyc
 site-packages/rpm/__init__.so
 site-packages/rpm/_rpmmodule.so
 site-packages/rpm/_rpm.so
-site-packages/rpm/transaction.pyo
+site-packages/rpm/transaction.cpython-36.opt-1.pyc
 site-packages/sitecustomizemodule.so
-site-packages/sitecustomize.pyo
+site-packages/sitecustomize.cpython-36.opt-1.pyc
 site-packages/sitecustomize.so
 site-packages/six.py
-site.pyo
+site.cpython-36.opt-1.pyc
 site.so
-socket.pyo
+socket.cpython-36.opt-1.pyc
 sre_compilemodule.so
-sre_compile.pyo
+sre_compile.cpython-36.opt-1.pyc
 sre_compile.so
 sre_constantsmodule.so
-sre_constants.pyo
+sre_constants.cpython-36.opt-1.pyc
 sre_constants.so
 sre_parsemodule.so
-sre_parse.pyo
+sre_parse.cpython-36.opt-1.pyc
 sre_parse.so
 statmodule.so
-stat.pyo
+stat.cpython-36.opt-1.pyc
 stat.so
-StringIO.pyo
+StringIO.cpython-36.opt-1.pyc
 stringmodule.so
-string.pyo
+string.cpython-36.opt-1.pyc
 string.so
 stropmodule.so
-strop.pyo
+strop.cpython-36.opt-1.pyc
 strop.so
 _structmodule.so
 structmodule.so
-_struct.pyo
-struct.pyo
+_struct.cpython-36.opt-1.pyc
+struct.cpython-36.opt-1.pyc
 _struct.so
 struct.so
-_strptime.pyo
-subprocess.pyo
-sysconfig.pyo
-_sysconfigdata.pyo
-tempfile.pyo
+_strptime.cpython-36.opt-1.pyc
+subprocess.cpython-36.opt-1.pyc
+sysconfig.cpython-36.opt-1.pyc
+_sysconfigdata.cpython-36.opt-1.pyc
+tempfile.cpython-36.opt-1.pyc
 textwrapmodule.so
-textwrap.pyo
+textwrap.cpython-36.opt-1.pyc
 textwrap.so
 timemodule.so
-time.pyo
+time.cpython-36.opt-1.pyc
 time.so
-traceback.pyo
+traceback.cpython-36.opt-1.pyc
 typesmodule.so
-types.pyo
+types.cpython-36.opt-1.pyc
 types.so
-urllib2.pyo
-urllib.pyo
-urlparse.pyo
+urllib2.cpython-36.opt-1.pyc
+urllib.cpython-36.opt-1.pyc
+urlparse.cpython-36.opt-1.pyc
 UserDictmodule.so
-UserDict.pyo
+UserDict.cpython-36.opt-1.pyc
 UserDict.so
 warningsmodule.so
-warnings.pyo
+warnings.cpython-36.opt-1.pyc
 warnings.so
-weakref.pyo
-_weakrefset.pyo
-xml/dom/domreg.pyo
-xml/dom/expatbuilder.pyo
-xml/dom/__init__.pyo
-xml/dom/minicompat.pyo
-xml/dom/minidom.pyo
-xml/dom/NodeFilter.pyo
-xml/dom/xmlbuilder.pyo
-xml/__init__.pyo
-xml/parsers/expat.pyo
-xml/parsers/__init__.pyo
+weakref.cpython-36.opt-1.pyc
+_weakrefset.cpython-36.opt-1.pyc
+xml/dom/domreg.cpython-36.opt-1.pyc
+xml/dom/expatbuilder.cpython-36.opt-1.pyc
+xml/dom/__init__.cpython-36.opt-1.pyc
+xml/dom/minicompat.cpython-36.opt-1.pyc
+xml/dom/minidom.cpython-36.opt-1.pyc
+xml/dom/NodeFilter.cpython-36.opt-1.pyc
+xml/dom/xmlbuilder.cpython-36.opt-1.pyc
+xml/__init__.cpython-36.opt-1.pyc
+xml/parsers/expat.cpython-36.opt-1.pyc
+xml/parsers/__init__.cpython-36.opt-1.pyc
 zipfilemodule.so
-zipfile.pyo
+zipfile.cpython-36.opt-1.pyc
 zipfile.so
 zlibmodule.so
-zlib.pyo
+zlib.cpython-36.opt-1.pyc
 zlib.so
diff --git a/rpmlint-mini.changes b/rpmlint-mini.changes
index 9c8c67e..eebb82d 100644
--- a/rpmlint-mini.changes
+++ b/rpmlint-mini.changes
@@ -2,6 +2,8 @@
 Thu Sep 28 12:32:54 UTC 2017 - dmueller@suse.com
 
 - rebuild against rpmlint 1.10
+  drops: rpmlint-deps.patch
+- Switch to Python 3.x
 
 -------------------------------------------------------------------
 Fri May 26 07:10:46 UTC 2017 - matwey.kornilov@gmail.com
diff --git a/rpmlint-mini.spec b/rpmlint-mini.spec
index ac46c8e..3b60ed2 100644
--- a/rpmlint-mini.spec
+++ b/rpmlint-mini.spec
@@ -30,8 +30,6 @@ Source102:      rpmlint-mini.config
 Source103:      polkit-default-privs.config
 Source104:      appdata_checker.config
 Source1000:     rpmlint-mini.rpmlintrc
-# adjusts python deps for Leap 42.3
-Patch0:         rpmlint-deps.patch
 # need to fetch the file from there
 BuildRequires:  checkbashisms
 BuildRequires:  dash
@@ -40,9 +38,6 @@ BuildRequires:  glib2-devel-static
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
 BuildRequires:  polkit-default-privs
-BuildRequires:  python-magic
-BuildRequires:  python-xml
-BuildRequires:  rpm-python
 BuildRequires:  rpmlint
 #!BuildIgnore:  rpmlint-mini
 Requires:       cpio
@@ -54,9 +49,6 @@ source packages can be checked.
 %prep
 %setup -q -n desktop-file-utils-0.23
 [[ -r COPYING ]]
-%if 0%{?sle_version}
-patch -d %{_sourcedir}  < %{PATCH0}
-%endif
 
 %build
 %configure
@@ -87,28 +79,27 @@ install -m 644 "%{SOURCE102}" %{buildroot}/opt/testing/share/rpmlint
 # extra data
 install -m 755 -d %{buildroot}/opt/testing/share/rpmlint/data
 install -m 644 %{_sysconfdir}/polkit-default-privs.standard %{buildroot}/opt/testing/share/rpmlint/data
-install -m 644 -D %{_includedir}/python%{py_ver}/pyconfig.h %{buildroot}/opt/testing/include/python%{py_ver}/pyconfig.h
 #
-cd %{py_libdir}
+cd %{_libdir}/python%{py3_ver}/__pycache__/
 for f in $(<%{SOURCE100}); do
-  find -path "*/$f" -exec install -D {} %{buildroot}/opt/testing/%{_lib}/python%{py_ver}/{} \;
+  find -path "*/$f" -exec install -D {} %{buildroot}/opt/testing/%{_lib}/python%{py3_ver}/{} \;
 done
-cd %{_prefix}/lib/python%{py_ver}
+cd %{_prefix}/lib/python%{py3_ver}
 for f in $(<%{SOURCE100}); do
-  find -path "*/$f" -exec install -D {} %{buildroot}/opt/testing/%{_lib}/python%{py_ver}/{} \;
+  find -path "*/$f" -exec install -D {} %{buildroot}/opt/testing/%{_lib}/python%{py3_ver}/{} \;
 done
-install -m 644 %{_prefix}/lib/python%{py_ver}/site-packages/magic.py %{buildroot}/opt/testing/%{_lib}/python%{py_ver}/site-packages/magic.py
-install -D %{_bindir}/python %{buildroot}/opt/testing/bin/python
+# install -m 644 %{_prefix}/lib/python%{py3_ver}/site-packages/magic.py %{buildroot}/opt/testing/%{_lib}/python%{py3_ver}/site-packages/magic.py
+install -D %{_bindir}/python3 %{buildroot}/opt/testing/bin/python3
 cp -a %{_libdir}/libmagic.so.* %{buildroot}/opt/testing/%{_lib}
 cp -a %{_datadir}/misc/magic* %{buildroot}/opt/testing/share
-cp -a %{_libdir}/libpython%{py_ver}.so.* %{buildroot}/opt/testing/%{_lib}
+cp -a %{_libdir}/libpython%{py3_ver}m.so.* %{buildroot}/opt/testing/%{_lib}
 cp -a %{_bindir}/rpmlint %{buildroot}/opt/testing/share/rpmlint/rpmlint.py
 pushd %{buildroot}/opt/testing/share/rpmlint
-PYTHONOPTIMIZE=1 python %{py_libdir}/py_compile.py *.py
-rm *.py
+PYTHONOPTIMIZE=1 python3 -m py_compile *.py
+rm -v *.py
 popd
-pushd %{buildroot}/opt/testing/%{_lib}/python%{py_ver}/site-packages/
-PYTHONOPTIMIZE=1 find -name \*.py -exec python %{py_libdir}/py_compile.py {} \;
+pushd %{buildroot}/opt/testing/%{_lib}/python%{py3_ver}/site-packages/
+PYTHONOPTIMIZE=1 find -name \*.py -exec python3 -m py_compile {} \;
 find -name \*.py -delete
 popd
 rm -rf %{buildroot}/{usr,etc}
@@ -135,7 +126,7 @@ chmod +x %{my_requires}
 LD_LIBRARY_PATH=%{buildroot}/opt/testing/%{_lib}
 PYTHONPATH=%{buildroot}/opt/testing/share/rpmlint
 export PYTHONPATH LD_LIBRARY_PATH
-%{buildroot}/opt/testing/bin/python -tt -u -O %{buildroot}/opt/testing/share/rpmlint/rpmlint.pyo --help || exit 1
+strace -eopen %{buildroot}/opt/testing/bin/python3 -tt -u -O %{buildroot}/opt/testing/share/rpmlint/__pycache__/rpmlint.cpython-36.opt-1.pyc  --help || exit 1
 echo ".. ok"
 
 %files
diff --git a/rpmlint.wrapper b/rpmlint.wrapper
index 3c5d1ee..5a76843 100644
--- a/rpmlint.wrapper
+++ b/rpmlint.wrapper
@@ -8,4 +8,4 @@ PATH="/opt/testing/bin:$PATH"
 rpmlintdir="/opt/testing/share/rpmlint"
 PYTHONPATH="$rpmlintdir"
 export PYTHONPATH LD_LIBRARY_PATH
-exec /opt/testing/bin/python -tt -u -O "$rpmlintdir"/rpmlint.pyo  -C "$rpmlintdir" -f "$rpmlintdir"/rpmlint-mini.config "$@"
+exec /opt/testing/bin/python3 -tt -u -O "$rpmlintdir"/__pycache__/rpmlint.cpython-36.opt-1.pyc  -C "$rpmlintdir" -f "$rpmlintdir"/rpmlint-mini.config "$@"