From fd5ae12951d1a5f08246a5a444e28a563b32524f Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Tue, 13 Dec 2022 22:15:36 +0100
Subject: [PATCH] Dropping klayout Python module from RPM and DEB packages as
 this creates clashes with the PyPI python module. As substitute install
 klayout module from PyPI.

---
 scripts/makedeb.sh            | 13 -------------
 scripts/rpm-data/klayout.spec | 18 ------------------
 2 files changed, 31 deletions(-)

diff --git a/scripts/makedeb.sh b/scripts/makedeb.sh
index 760fe0e19..81fc8291d 100755
--- a/scripts/makedeb.sh
+++ b/scripts/makedeb.sh
@@ -55,10 +55,6 @@ sharedir="usr/share"
 bindir="usr/bin"
 libdir="usr/lib/klayout"
 
-# TODO: is there a better way to produce this path?
-distpackdir="usr/lib/python3/dist-packages"
-pylibdir="$distpackdir/klayout"
-
 # clean bin directory
 rm -rf $bininstdir
 
@@ -97,7 +93,6 @@ mkdir -p makedeb-tmp/${sharedir}/applications
 mkdir -p makedeb-tmp/${sharedir}/pixmaps
 mkdir -p makedeb-tmp/${libdir}/db_plugins
 mkdir -p makedeb-tmp/${libdir}/lay_plugins
-mkdir -p makedeb-tmp/${pylibdir}
 mkdir -p makedeb-tmp/${bindir}
 
 cp etc/klayout.desktop makedeb-tmp/${sharedir}/applications
@@ -111,13 +106,6 @@ cp -pd $bininstdir/klayout makedeb-tmp/${bindir}
 cp -pd $bininstdir/lib*so* makedeb-tmp/${libdir}
 cp -pd $bininstdir/db_plugins/lib*so* makedeb-tmp/${libdir}/db_plugins
 cp -pd $bininstdir/lay_plugins/lib*so* makedeb-tmp/${libdir}/lay_plugins
-cp -pd $bininstdir/pymod/klayout/*so makedeb-tmp/${pylibdir}
-cp -pd $bininstdir/pymod/klayout/*py makedeb-tmp/${pylibdir}
-for d in db tl rdb lib; do
-  mkdir -p makedeb-tmp/${pylibdir}/$d
-  cp -pd $bininstdir/pymod/klayout/$d/*py makedeb-tmp/${pylibdir}/$d
-done
-sed "s/%VERSION%/$version/g" <scripts/klayout.egg-info >makedeb-tmp/${distpackdir}/klayout.egg-info
 
 cd makedeb-tmp
 
@@ -141,7 +129,6 @@ grep -q $version ${sharedir}/doc/klayout/changelog.Debian || (
 echo "Modifying control file .."
 
 strip ${bindir}/*
-strip ${pylibdir}/*.so
 strip ${libdir}/db_plugins/*.so*
 strip ${libdir}/lay_plugins/*.so*
 
diff --git a/scripts/rpm-data/klayout.spec b/scripts/rpm-data/klayout.spec
index 71f29855b..c7024b50c 100644
--- a/scripts/rpm-data/klayout.spec
+++ b/scripts/rpm-data/klayout.spec
@@ -45,7 +45,6 @@ Requires: qt5-qttools >= 5.11.1
 Requires: qt5-qttools-devel >= 5.11.1
 
 %define buildopt -j2
-%define pylib %{python_sitearch}
 %define __python /usr/bin/python3
 %endif
 
@@ -55,7 +54,6 @@ Requires:	ruby >= 2.0.0
 Requires:	python3 >= 3.6.0
 Requires: qt-x11 >= 4.8.5
 %define buildopt -j2
-%define pylib %{python3_sitearch}
 %endif
 
 %if "%{target_system}" == "centos6"
@@ -65,7 +63,6 @@ Requires: ruby >= 1.8.7
 Requires: python >= 2.6.6
 Requires: qt-x11 >= 4.6.2
 %define buildopt -libcurl -j2
-%define pylib %{python_sitearch}
 %endif
 
 %if "%{target_system}" == "opensuse42_2"
@@ -74,7 +71,6 @@ Requires:	ruby2.3 >= 2.3.1
 Requires:	python3 >= 3.4.6
 Requires: libqt4-x11 >= 4.8.6
 %define buildopt -j2
-%define pylib %{python3_sitearch}
 %endif
 
 %if "%{target_system}" == "opensuse42_3"
@@ -83,7 +79,6 @@ Requires:	ruby2.3 >= 2.3.1
 Requires:	python3 >= 3.4.6
 Requires: libqt4-x11 >= 4.8.6
 %define buildopt -j2
-%define pylib %{python3_sitearch}
 %endif
 
 %if "%{target_system}" == "opensuse15"
@@ -92,7 +87,6 @@ Requires:	ruby >= 2.5
 Requires:	python3 >= 3.6
 Requires: libqt4-x11 >= 4.8.7
 %define buildopt -j2
-%define pylib %{python3_sitearch}
 %endif
 
 %if "%{target_system}" == "opensuse15"
@@ -148,17 +142,6 @@ strip %{_builddir}/bin.$TARGET/strm*
 
 TARGET="linux-release"
 
-# create and populate pylib
-mkdir -p %{buildroot}%{pylib}/klayout
-cp -pd %{_builddir}/bin.$TARGET/pymod/klayout/*.so %{buildroot}%{pylib}/klayout
-cp -pd %{_builddir}/bin.$TARGET/pymod/klayout/*.py %{buildroot}%{pylib}/klayout
-chmod 644 %{buildroot}%{pylib}/klayout/*
-for d in tl db rdb lib; do
-  mkdir -p %{buildroot}%{pylib}/klayout/$d
-  cp -pd %{_builddir}/bin.$TARGET/pymod/klayout/$d/*.py %{buildroot}%{pylib}/klayout/$d
-  chmod 644 %{buildroot}%{pylib}/klayout/$d/*
-done
-
 # create and populate libdir
 mkdir -p %{buildroot}%{_libdir}/klayout
 mkdir -p %{buildroot}%{_libdir}/klayout/db_plugins
@@ -191,7 +174,6 @@ install -Dm644 %{_sourcedir}/etc/logo.png %{buildroot}%{_datadir}/pixmaps/%{name
 %doc CONTRIB
 %{_bindir}/klayout
 %{_bindir}/strm*
-%{pylib}/klayout/*
 %{_libdir}/klayout/*
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png