- upstream fix for podofo 0.10 detection

[packages/scribus.git] / scribus.spec

diff --git a/scribus.spec b/scribus.spec
index f263105c54ff0963754f4a09361713da4133cc2d..93f0ce14e5fe423053dee03a65a28b590a59c939 100644 (file)
--- a/scribus.spec
+++ b/scribus.spec
@@ -2,22 +2,25 @@
 # - OpenSceneGraph support (WANT_NOOSG to disable)
 # - system hyphen
 # - more system libs, see scribus/third_party (e.g. libwpg)
+# - qt6 bcond? (BR: Qt6{Core,Core5Compat,Gui,Widgets,Network} >= 6.2.0, cmake >= 3.16.0)
 #
 # Conditional build:
 %bcond_without cups    # CUPS support
 #
-%define        qt_ver  5.11.0
+%define        qt_ver  5.14.0
 Summary:       Scribus - Open Source Desktop Publishing
 Summary(pl.UTF-8):     Scribus - DTP dla Wolnego Oprogramowania
 Name:          scribus
-Version:       1.5.7
-Release:       2
+Version:       1.5.8
+Release:       6
 License:       GPL v2+
 Group:         X11/Applications/Publishing
 Source0:       https://downloads.sourceforge.net/scribus/%{name}-%{version}.tar.xz
-# Source0-md5: 4d0c63cfdade8a9abf225a4415e43694
+# Source0-md5: ff9e966a2251a6c8800bb26fcb4b7c59
 Patch0:                %{name}-docs.patch
-Patch1:                harfbuzz.patch
+Patch1:                %{name}-poppler.patch
+Patch2:                %{name}-poppler-22.09.0.patch
+Patch3:                podofo-0.10.patch
 URL:           https://www.scribus.net/
 BuildRequires: GraphicsMagick-devel
 BuildRequires: Qt5Core-devel >= %{qt_ver}
@@ -29,7 +32,7 @@ BuildRequires:        Qt5Widgets-devel >= %{qt_ver}
 BuildRequires: Qt5Xml-devel >= %{qt_ver}
 BuildRequires: boost-devel
 BuildRequires: cairo-devel >= 1.2.0
-BuildRequires: cmake >= 3.12.0
+BuildRequires: cmake >= 3.14.0
 %if %{with cups}
 BuildRequires: cups-devel
 %else
@@ -39,6 +42,7 @@ BuildRequires:        fontconfig-devel
 BuildRequires: freetype-devel >= 2.1.0
 BuildRequires: harfbuzz-devel >= 0.9.42
 BuildRequires: harfbuzz-icu-devel
+BuildRequires: harfbuzz-subset-devel >= 2.4.0
 BuildRequires: hunspell-devel
 # missing find_package(HYPHEN); bundled version is used
 #BuildRequires:        hyphen-devel
@@ -52,7 +56,7 @@ BuildRequires:        libpagemaker-devel
 BuildRequires: libpng-devel >= 2:1.6
 BuildRequires: libqxp-devel
 BuildRequires: librevenge-devel
-BuildRequires: libstdc++-devel >= 6:4.7
+BuildRequires: libstdc++-devel >= 6:7
 BuildRequires: libtiff-devel
 BuildRequires: libvisio-devel >= 0.1
 BuildRequires: libxml2-devel >= 2
@@ -60,10 +64,10 @@ BuildRequires:      libzmf-devel
 BuildRequires: openssl-devel
 BuildRequires: pkgconfig
 BuildRequires: podofo-devel
-BuildRequires: poppler-cpp-devel >= 0.58.0
-BuildRequires: poppler-devel >= 0.58.0
-BuildRequires: python-devel >= 2
-BuildRequires: python-modules >= 2
+BuildRequires: poppler-cpp-devel >= 0.86.0
+BuildRequires: poppler-devel >= 0.86.0
+BuildRequires: python3-devel >= 1:3.2
+BuildRequires: python3-modules >= 1:3.2
 BuildRequires: qt5-build >= %{qt_ver}
 BuildRequires: qt5-linguist >= %{qt_ver}
 BuildRequires: qt5-qmake >= %{qt_ver}
@@ -83,13 +87,15 @@ Requires:   Qt5PrintSupport >= %{qt_ver}
 Requires:      Qt5Widgets >= %{qt_ver}
 Requires:      Qt5Xml >= %{qt_ver}
 Requires:      harfbuzz >= 0.9.42
+Requires:      harfbuzz-subset >= 2.4.0
 Requires:      hicolor-icon-theme
-Requires:      python-PIL
-Requires:      python-tkinter
+Requires:      python3-pillow
+Requires:      python3-tkinter
 Requires:      shared-mime-info
-Obsoletes:     scribus-scripting
-Obsoletes:     scribus-short-words
-Obsoletes:     scribus-svg
+Obsoletes:     scribus-devel < 1.3.3.6
+Obsoletes:     scribus-scripting < 0.6
+Obsoletes:     scribus-short-words < 1.3
+Obsoletes:     scribus-svg < 0.4
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                specflags_ia32  -fomit-frame-pointer
@@ -106,17 +112,6 @@ Scribus jest to program do tworzenia publikacji z założenia generujący
 dokumenty PDF oraz Postscript nadające się do użytku komercyjnego,
 przeznaczony głównie, lecz nie tylko, dla systemu Linux(R).
 
-%package devel
-Summary:       Header files for Scribus plugins development
-Summary(pl.UTF-8):     Pliki nagłówkowe do tworzenia wtyczek Scribusa
-Group:         Development/Libraries
-
-%description devel
-Header files for Scribus plugins development.
-
-%description devel -l pl.UTF-8
-Pliki nagłówkowe do tworzenia wtyczek Scribusa.
-
 %package docs
 Summary:       Documentation for Scribus
 Summary(pl.UTF-8):     Dokumentacja dla Scribusa
@@ -162,15 +157,15 @@ Domyślne szablony dokumentów dostarczane wraz ze Scribusem.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
-mkdir -p build
-cd build
-
-%cmake .. \
+%cmake -B build \
+       -DWANT_CPP17=ON \
        -DWANT_GRAPHICSMAGICK:BOOL=ON
 
-%{__make}
+%{__make} -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT