Attachment 10248 Details for Bug 41870 – make-arch.patch

[patch] make-arch.patch

make-arch.patch (text/plain), 1.86 KB, created by Sergey V Turchin on 2022-02-04 10:18:06 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Sergey V Turchin

Created: 2022-02-04 10:18:06 MSK

Size: 1.86 KB

patch

obsolete

>commit 470e9df8e83dd370fe76fee0f32b443f3e94abcd
>Author: Sergey V Turchin <zerg@altlinux.org>
>Date:   Fri Feb 4 10:00:30 2022 +0300
>
>    - fix to build according qtwebengine arches
>
>diff --git a/mnemosyne.spec b/mnemosyne.spec
>index 395fbbf..3ed2ef0 100644
>--- a/mnemosyne.spec
>+++ b/mnemosyne.spec
>@@ -28,9 +28,9 @@ Source10:       mnemosyne-mktarball.sh
> Patch0:		mnemosyne-desktop.patch
> License:	AGPLv3
> 
>-BuildArch:	noarch
> # no python3-qt5-webengine on power64
> ExclusiveArch:	noarch %{qt5_qtwebengine_arches}
>+BuildRequires(pre):	rpm-macros-qt5-webengine
> BuildRequires:	desktop-file-utils
> BuildRequires:	python3-devel
> BuildRequires:	python3-module-distribute
>@@ -45,7 +45,9 @@ BuildRequires:	texlive
> %endif
> Requires:	icon-theme-hicolor
> Requires:	python3-module-PyQt5
>+%ifarch %qt5_qtwebengine_arches
> Requires:	python3-module-PyQtWebEngine
>+%endif
> Requires:	python3-module-matplotlib-qt5
> Requires:	python3-module-cherrypy
> Requires:	python3-module-webob
>@@ -75,6 +77,11 @@ cp -p openSM2sync/LICENSE LICENSE.openSM2sync
> 
> %install
> %python3_install
>+# make arch dependent
>+if [ "%python3_sitelibdir" != "%python3_sitelibdir_noarch" ] ; then
>+    mkdir -p %buildroot/%python3_sitelibdir
>+    mv %buildroot/%python3_sitelibdir_noarch/* %buildroot/%python3_sitelibdir/
>+fi
> 
> install -d %{buildroot}%{_datadir}/applications
> desktop-file-install --vendor="" \
>@@ -98,9 +105,9 @@ popd
> %doc ChangeLog README
> %doc --no-dereference LICENSE LICENSE.mnemosyne LICENSE.openSM2sync
> %{_bindir}/%{name}
>-%{python3_sitelibdir_noarch}/%{name}
>-%{python3_sitelibdir_noarch}/Mnemosyne-%{version}-py%{__python3_version}.egg-info
>-%{python3_sitelibdir_noarch}/openSM2sync
>+%{python3_sitelibdir}/%{name}
>+%{python3_sitelibdir}/Mnemosyne-%{version}-py%{__python3_version}.egg-info
>+%{python3_sitelibdir}/openSM2sync
> %{_datadir}/applications/%{name}.desktop
> %{_datadir}/icons/hicolor/*/apps/%{name}.png
>

Actions: View | Diff

Attachments on bug 41870: 10248