Cor Blom 2024-03-22 19:59:47 +00:00 committed by Git OBS Bridge
parent 2a8d6b2d41
commit 582fa33b2c
2 changed files with 22 additions and 23 deletions

View File

@ -13,7 +13,6 @@ Thu Jan 18 21:58:03 UTC 2024 - Cor Blom <cornelis@solcon.nl>
- Update to 2.4.0 RC 1 - Update to 2.4.0 RC 1
- Build for Tumbleweed with Qt 6 - Build for Tumbleweed with Qt 6
- Swith buildsystem to cmake
- Remove no longer necessary patches: - Remove no longer necessary patches:
* correct-shebang.patch * correct-shebang.patch
* remove_python_shebang.patch * remove_python_shebang.patch

View File

@ -32,8 +32,9 @@ Source1: lyxrc.dist
Source2: lyx.keyring Source2: lyx.keyring
Source3: http://ftp.lyx.org/pub/lyx/devel/lyx-2.4/lyx-%{version}.tar.xz.sig Source3: http://ftp.lyx.org/pub/lyx/devel/lyx-2.4/lyx-%{version}.tar.xz.sig
Source4: README.SUSE Source4: README.SUSE
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bc BuildRequires: bc
BuildRequires: cmake
BuildRequires: enchant-devel BuildRequires: enchant-devel
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: file-devel BuildRequires: file-devel
@ -48,16 +49,16 @@ BuildRequires: update-desktop-files
BuildRequires: zlib-devel BuildRequires: zlib-devel
%if %{with qt6} %if %{with qt6}
BuildRequires: qt6-gui-private-devel BuildRequires: qt6-gui-private-devel
BuildRequires: cmake(Qt6Concurrent) BuildRequires: pkgconfig(Qt6Concurrent)
BuildRequires: cmake(Qt6Core) BuildRequires: pkgconfig(Qt6Core)
BuildRequires: cmake(Qt6Core5Compat) BuildRequires: pkgconfig(Qt6Core5Compat)
BuildRequires: cmake(Qt6DBus) BuildRequires: pkgconfig(Qt6DBus)
BuildRequires: cmake(Qt6Gui) BuildRequires: pkgconfig(Qt6Gui)
BuildRequires: cmake(Qt6PrintSupport) BuildRequires: pkgconfig(Qt6PrintSupport)
BuildRequires: cmake(Qt6Sql) BuildRequires: pkgconfig(Qt6Sql)
BuildRequires: cmake(Qt6Svg) BuildRequires: pkgconfig(Qt6Svg)
BuildRequires: cmake(Qt6Widgets) BuildRequires: pkgconfig(Qt6Widgets)
BuildRequires: cmake(Qt6Xml) BuildRequires: pkgconfig(Qt6Xml)
%else %else
BuildRequires: pkgconfig(Qt5Concurrent) BuildRequires: pkgconfig(Qt5Concurrent)
BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Core)
@ -154,23 +155,22 @@ A collection of Math symbol fonts for LyX.
%build %build
TEXMF=%{_datadir}/texmf TEXMF=%{_datadir}/texmf
%cmake -DLYX_INSTALL=ON \ %configure \
-DLYX_REQUIRE_SPELLCHECK=ON \ --enable-build-type=rel \
-DLYX_ENCHANT=ON \ --without-included-boost \
-DLYX_HUNSPELL=ON \ --without-aspell \
-DLYX_RELEASE=ON \ --with-hunspell \
--with-enchant \
%if %{with qt6} %if %{with qt6}
-DLYX_USE_QT=QT6 \ --enable-qt6 \
%else %else
-DLYX_USE_QT=QT5 \ --enable-qt5
%endif %endif
-DLYX_PACKAGE_SUFFIX=OFF \ make %{?_smp_mflags}
-DLYX_PROGRAM_SUFFIX=OFF
%cmake_build
%install %install
TEXMF=%{_datadir}/texmf TEXMF=%{_datadir}/texmf
%cmake_install TEXMF=$TEXMF make install TEXMF=$TEXMF
%python3_fix_shebang %python3_fix_shebang
# some defaults # some defaults