diff --git a/scribus.spec b/scribus.spec index 889527c..49508c6 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,6 +1,6 @@ Name: scribus -Version: 1.5.6.1 -Release: 6%{?dist} +Version: 1.5.7 +Release: 1%{?dist} Summary: Desktop Publishing application written in Qt # swatches bring in the fun licenses License: GPLv2+ and OGL and CC0 and CC-BY and CC-BY-SA and Public Domain and ASL 2.0 and LGPLv2+ @@ -15,9 +15,6 @@ Source0: %{name}-%{version}-free.tar.xz #Source1: http://downloads.sourceforge.net/%%{name}/%%{name}-%%{version}.tar.xz.asc Patch0: scribus-ctorfix.patch -# Fix build with podofo-0.9.7, which introduced PdfObject automatic ownership handling -# See https://sourceforge.net/p/podofo/code/2000/ -Patch1: scribus_podofo.patch BuildRequires: boost-devel BuildRequires: cmake @@ -58,7 +55,7 @@ BuildRequires: pkgconfig(poppler) BuildRequires: pkgconfig(poppler-cpp) BuildRequires: pkgconfig(poppler-data) BuildRequires: pkgconfig(python3) -BuildRequires: pkgconfig(Qt5) +BuildRequires: pkgconfig(Qt5) > 5.14 BuildRequires: pkgconfig(Qt5Quick) BuildRequires: pkgconfig(Qt5UiTools) BuildRequires: pkgconfig(Qt5WebKit) @@ -92,8 +89,7 @@ import/export and creation of color separations. chmod a-x scribus/pageitem_latexframe.h # drop shebang lines from python scripts -pathfix.py -pni "%{__python3} %{py3_shbang_opts}" \ - %{name}/plugins/scriptplugin/{samples,scripts}/*.py +%py3_shebang_fix %{name}/plugins/scriptplugin/{samples,scripts}/*.py %build %cmake \ @@ -144,6 +140,10 @@ appstream-util validate-relax --nonet \ %changelog +* Wed May 12 2021 Luya Tshimbalanga - 1.5.7-1 +- Update to 1.5.7 +- Drop patch for podofo 0.9.7 fixed upstream + * Wed Jan 27 2021 Fedora Release Engineering - 1.5.6.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/scribus_podofo.patch b/scribus_podofo.patch deleted file mode 100644 index 581d615..0000000 --- a/scribus_podofo.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -rupN scribus-1.5.6.1/scribus/pdf_analyzer.cpp scribus-1.5.6.1-new/scribus/pdf_analyzer.cpp ---- scribus-1.5.6.1/scribus/pdf_analyzer.cpp 2020-11-14 23:37:18.000000000 +0100 -+++ scribus-1.5.6.1-new/scribus/pdf_analyzer.cpp 2021-01-10 17:11:46.352584802 +0100 -@@ -139,7 +139,6 @@ PDFColorSpace PDFAnalyzer::getCSType(Pdf - { - pBase = cs->GetOwner()->GetObject(base.GetReference()); - } -- pBase->SetOwner(cs->GetOwner()); - return getCSType(pBase); - } - if (csTypeName == "Separation") diff --git a/sources b/sources index 731e07c..36803ad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scribus-1.5.6.1-free.tar.xz) = f8888db74a20a6de24e7979bd99bbc13d9c45a44440c1706b075fdedc9ef624990b29e8f3168af0cffae610c1adf787cd047eb267d76e2cf37c16b8165f58b9d +SHA512 (scribus-1.5.7-free.tar.xz) = 10d13fb5444461e7eb26b519bef9ffc421f209bda10370307366d826258575b02fab0dc8769f01179c346b18211b668013ddfca7dc811cae07e686f2b2d4b287