From 064bcb97126809116b48f14378fb67b39aff3c15 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
Date: Mar 28 2021 14:19:04 +0000
Subject: Apply bug 1941827 suggestion


---

diff --git a/mcomix3.spec b/mcomix3.spec
index a697a11..1f9bf10 100644
--- a/mcomix3.spec
+++ b/mcomix3.spec
@@ -8,7 +8,7 @@
 Name:			mcomix3
 # For now, choose version 0
 Version:		0
-Release:		0.11.D%{gitdate}git%{shortcommit}%{?dist}
+Release:		0.12.D%{gitdate}git%{shortcommit}%{?dist}
 Summary:		User-friendly, customizable image viewer for comic books
 # GPL version info is from mcomix/mcomixstarter.py
 License:		GPLv2+
@@ -20,7 +20,7 @@ Source0:		%{name}-%{tarballdate}T%{tarballtime}.tar.bz2
 # Source0 is created by Source1
 Source1:		create-mcomix3-git-bare-tarball.sh
 # Some additional files
-Source2:		mcomix3starter.sh
+Source2:		mcomix3starter.sh.in
 # Patches
 Patch2:		0002-Change-domain-name-for-gettext.patch
 Patch3:		0003-Search-gettext-files-in-system-wide-directory.patch
@@ -81,7 +81,14 @@ popd
 
 popd
 
+# starter script
+cat %SOURCE2 | sed -e 's|@python3_sitelib@|%python3_sitelib|g' > mcomix3starter.sh
+# create starter script for comicthumb
+cat mcomix3starter.sh | sed -e 's|mcomixstarter|comicthumb|' > comicthumbstarter.sh
+
 %install
+BUILDTOPDIR=$(pwd)
+
 pushd %{name}
 cp -p [A-Z]* ..
 popd # from %%name
@@ -101,7 +108,8 @@ cp -a localroot localroot.2
 pushd localroot.2/mcomix
 
 # Wrapper script
-install -cpm 0755 %{SOURCE2} ${DSTTOPDIR}
+install -cpm 0755 ${BUILDTOPDIR}/mcomix3starter.sh ${DSTTOPDIR}
+install -cpm 0755 ${BUILDTOPDIR}/comicthumbstarter.sh ${DSTTOPDIR}
 # locale files
 find mcomix/messages/* -type f | while read f
 do
@@ -134,7 +142,7 @@ popd # from %%name
 # Wrapper symlink
 mkdir %{buildroot}/%{_bindir}
 ln -sf ../../${SITETOPDIR}/mcomix3starter.sh %{buildroot}%{_bindir}/mcomix3
-ln -sf ../../${SITETOPDIR}/comicthumb.py %{buildroot}%{_bindir}/comicthumb
+ln -sf ../../${SITETOPDIR}/comicthumbstarter.sh %{buildroot}%{_bindir}/comicthumb
 
 pushd %{name}
 # mime data
@@ -192,8 +200,15 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat
 
 
 %changelog
+* Sun Mar 28 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> 0-0.12.D20210321gitdfe9520
+- Apply bug 1941827 suggestion
+
 * Fri Mar 26 2021 Mamoru TASAKA <mtasaka@fedoraproject.org>
-- Update to the latest git
+- Update to the latest git (20210321gitdfe9520)
+
+* Tue Mar 23 2021 Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
+- Simply mcomix3 starter script (bug 1941827)
+- Also create starter script for comicthumb (bug 1941827)
 
 * Tue Mar  9 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0-0.11.D20210226gite5f39a2
 - Update to the latest git
diff --git a/mcomix3starter.sh.in b/mcomix3starter.sh.in
index 5c158d3..7a442ad 100644
--- a/mcomix3starter.sh.in
+++ b/mcomix3starter.sh.in
@@ -1,8 +1,4 @@
-#!/usr/bin/bash
+#!/bin/sh
+export PYTHONPATH=@python3_sitelib@/mcomix3/mcomix3
+exec @python3_sitelib@/mcomix3/mcomixstarter.py "$*"
 
-SCRIPTPATH="${BASH_SOURCE[0]}"
-ABSPATH="$(readlink $SCRIPTPATH)"
-SCRIPTDIR=$(cd $(dirname $ABSPATH); pwd)
-export PYTHONPATH=${SCRIPTDIR}/mcomix3
-
-exec $SCRIPTDIR/mcomixstarter.py "$@"