diff --git a/lyx.changes b/lyx.changes index 3de1a2c..6e3334f 100644 --- a/lyx.changes +++ b/lyx.changes @@ -13,7 +13,6 @@ Thu Jan 18 21:58:03 UTC 2024 - Cor Blom - Update to 2.4.0 RC 1 - Build for Tumbleweed with Qt 6 -- Swith buildsystem to cmake - Remove no longer necessary patches: * correct-shebang.patch * remove_python_shebang.patch diff --git a/lyx.spec b/lyx.spec index 15b4ccc..9963028 100644 --- a/lyx.spec +++ b/lyx.spec @@ -32,8 +32,9 @@ Source1: lyxrc.dist Source2: lyx.keyring Source3: http://ftp.lyx.org/pub/lyx/devel/lyx-2.4/lyx-%{version}.tar.xz.sig Source4: README.SUSE +BuildRequires: autoconf +BuildRequires: automake BuildRequires: bc -BuildRequires: cmake BuildRequires: enchant-devel BuildRequires: fdupes BuildRequires: file-devel @@ -48,16 +49,16 @@ BuildRequires: update-desktop-files BuildRequires: zlib-devel %if %{with qt6} BuildRequires: qt6-gui-private-devel -BuildRequires: cmake(Qt6Concurrent) -BuildRequires: cmake(Qt6Core) -BuildRequires: cmake(Qt6Core5Compat) -BuildRequires: cmake(Qt6DBus) -BuildRequires: cmake(Qt6Gui) -BuildRequires: cmake(Qt6PrintSupport) -BuildRequires: cmake(Qt6Sql) -BuildRequires: cmake(Qt6Svg) -BuildRequires: cmake(Qt6Widgets) -BuildRequires: cmake(Qt6Xml) +BuildRequires: pkgconfig(Qt6Concurrent) +BuildRequires: pkgconfig(Qt6Core) +BuildRequires: pkgconfig(Qt6Core5Compat) +BuildRequires: pkgconfig(Qt6DBus) +BuildRequires: pkgconfig(Qt6Gui) +BuildRequires: pkgconfig(Qt6PrintSupport) +BuildRequires: pkgconfig(Qt6Sql) +BuildRequires: pkgconfig(Qt6Svg) +BuildRequires: pkgconfig(Qt6Widgets) +BuildRequires: pkgconfig(Qt6Xml) %else BuildRequires: pkgconfig(Qt5Concurrent) BuildRequires: pkgconfig(Qt5Core) @@ -154,23 +155,22 @@ A collection of Math symbol fonts for LyX. %build TEXMF=%{_datadir}/texmf -%cmake -DLYX_INSTALL=ON \ - -DLYX_REQUIRE_SPELLCHECK=ON \ - -DLYX_ENCHANT=ON \ - -DLYX_HUNSPELL=ON \ - -DLYX_RELEASE=ON \ +%configure \ + --enable-build-type=rel \ + --without-included-boost \ + --without-aspell \ + --with-hunspell \ + --with-enchant \ %if %{with qt6} - -DLYX_USE_QT=QT6 \ + --enable-qt6 \ %else - -DLYX_USE_QT=QT5 \ + --enable-qt5 %endif - -DLYX_PACKAGE_SUFFIX=OFF \ - -DLYX_PROGRAM_SUFFIX=OFF -%cmake_build +make %{?_smp_mflags} %install TEXMF=%{_datadir}/texmf -%cmake_install TEXMF=$TEXMF +make install TEXMF=$TEXMF %python3_fix_shebang # some defaults