[packages/lyx] - removing unnecesary patches - BR: python3 instead of python2 - S: basic texlive packages

[mrozowik]

commit c4f41efc946c0599ad56421429a6078ac4d18509
Author: Krzysztof Mrozowicz <mrozowik at pld-linux.org>
Date:   Sun Jun 25 01:00:40 2023 +0000

    - removing unnecesary patches
    - BR: python3 instead of python2
    - S: basic texlive packages

 boost-1.69.patch | 18 ------------------
 lyx.spec         | 16 ++++++++++------
 qt-ac.patch      | 22 ----------------------
 3 files changed, 10 insertions(+), 46 deletions(-)
---
diff --git a/lyx.spec b/lyx.spec
index a005832..9ca7612 100644
--- a/lyx.spec
+++ b/lyx.spec
@@ -9,7 +9,7 @@ Summary(pl.UTF-8):	Nakładka WYSIWYM na LaTeXa
 Summary(pt_BR.UTF-8):	Editor de Textos para ambiente Desktop
 Name:		lyx
 Version:	2.3.7
-Release:	0.1
+Release:	0.2
 Epoch:		1
 License:	GPL v2+
 Group:		Applications/Publishing/TeX
@@ -17,8 +17,6 @@ Source0:	http://ftp.lyx.org/pub/lyx/stable/2.3.x/%{name}-%{version}-1.tar.xz
 # Source0-md5:	d12aa448dc0fcc209f9baa8c13123840
 Source1:	%{name}.desktop
 Source2:	%{name}.png
-Patch0:		qt-ac.patch
-Patch1:		boost-1.69.patch
 URL:		http://www.lyx.org/
 BuildRequires:	Qt5Core-devel >= 5
 BuildRequires:	Qt5Gui-devel >= 5
@@ -42,15 +40,23 @@ BuildRequires:	rpm-pythonprov
 BuildRequires:	sed >= 4.0
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	zlib-devel >= 1.2.8
+BuildConflicts:	python >= 2
 Requires(post,postun):	tetex
 Requires:	gv
 Requires:	hunspell-libs >= 1.6.2
 Requires:	mythes >= 1.2.5
-Requires:	python-modules >= 1:2.7.0
+Requires:	python3-modules >= 3.3.0
 Requires:	tetex-format-latex
 Requires:	tetex-latex
+Requires:	texlive-latex-other
 Requires:	xdvi
 Requires:	zlib >= 1.2.8
+Suggests:	texlive-dviutils
+Suggests:	texlive-latex-bibtex
+Suggests:	texlive-latex-ams
+Suggests:	texlive-latex-beamer
+Suggests:	texlive-latex-pgf
+Suggests:	texlive-xetex
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		texmfdir	%{_datadir}/texmf
@@ -84,8 +90,6 @@ selecionadas pelo editor, não pelo digitador.
 
 %prep
 %setup -q
-#%patch0 -p1
-#%patch1 -p1
 %{__sed} -i '1s,/usr/bin/env python$,%{__python3},' \
 	lib/scripts/{listerrors,svg2pdftex.py,svg2pstex.py} \
 	lib/lyx2lyx/lyx2lyx
diff --git a/boost-1.69.patch b/boost-1.69.patch
deleted file mode 100644
index 5ff2e71..0000000
--- a/boost-1.69.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- lyx-2.3.2/src/support/FileName.cpp~	2018-12-09 21:04:52.000000000 +0100
-+++ lyx-2.3.2/src/support/FileName.cpp	2019-04-20 08:29:31.868290965 +0200
-@@ -67,15 +67,6 @@
- using namespace std;
- using namespace lyx::support;
- 
--// OK, this is ugly, but it is the only workaround I found to compile
--// with gcc (any version) on a system which uses a non-GNU toolchain.
--// The problem is that gcc uses a weak symbol for a particular
--// instantiation and that the system linker usually does not
--// understand those weak symbols (seen on HP-UX, tru64, AIX and
--// others). Thus we force an explicit instanciation of this particular
--// template (JMarc)
--template struct boost::detail::crc_table_t<32, 0x04C11DB7, true>;
--
- namespace lyx {
- namespace support {
- 
diff --git a/qt-ac.patch b/qt-ac.patch
deleted file mode 100644
index c288381..0000000
--- a/qt-ac.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- lyx-2.3.2/config/qt4.m4.orig	2018-12-09 21:04:52.000000000 +0100
-+++ lyx-2.3.2/config/qt4.m4	2019-04-20 08:21:06.607279868 +0200
-@@ -34,7 +34,7 @@
- 		    qt_corelibs="-lQt5Core"
- 		    qt_guilibs="-lQt5Core -lQt5Concurrent -lQt5Gui -lQt5Svg -lQt5Widgets"
- 		fi
--		for libname in $qt_corelibs '-framework QtCore'
-+		for libname in $qt_corelibs
- 		do
- 			QT_TRY_LINK($libname)
- 			if test -n "$qt_cv_libname"; then
-@@ -43,9 +43,7 @@
- 			fi
- 		done
- 		qt_cv_libname=
--		for libname in $qt_guilibs \
--		               '-framework QtCore -framework QtConcurrent -framework QtSvg -framework QtWidgets -framework QtMacExtras -framework QtGui'\
--		               '-framework QtCore -framework QtGui'
-+		for libname in $qt_guilibs
- 		do
- 			QT_TRY_LINK($libname)
- 			if test -n "$qt_cv_libname"; then
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lyx.git/commitdiff/c4f41efc946c0599ad56421429a6078ac4d18509