From ffd213fd717930d61b62617e3ee6fe5b38925312 Mon Sep 17 00:00:00 2001
From: Luya Tshimbalanga <luya@fedoraproject.org>
Date: Oct 31 2020 07:52:06 +0000
Subject: Update scribus.spec

- Further implement pkgconfig for build requirement
- Use python3dist for some python package build requirement

Signed-off-by: Luya Tshimbalanga <luya@fedoraproject.org>

---

diff --git a/scribus.spec b/scribus.spec
index e910798..203cebb 100644
--- a/scribus.spec
+++ b/scribus.spec
@@ -16,60 +16,58 @@ Source0:        %{name}-%{version}-free.tar.xz
 
 Patch0:         scribus-1.5.6-poppler-0.84.0.patch
 Patch1:         scribus-1.5.6-poppler-0.90.0.patch
-Patch2:		scribus-ctorfix.patch
-
-BuildRequires:	boost-devel
-BuildRequires:	cmake
-BuildRequires:	cups-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gcc-c++
-BuildRequires:	ghostscript
-BuildRequires:	GraphicsMagick-devel
-BuildRequires:	GraphicsMagick-c++-devel
-BuildRequires:	hyphen-devel
-BuildRequires:	hunspell-devel
-BuildRequires:	lcms2-devel
-BuildRequires:	libappstream-glib
-BuildRequires:	libcdr-devel
-BuildRequires:	libfreehand-devel
-BuildRequires:	libjpeg-turbo-devel
-BuildRequires:	libmspub-devel
-BuildRequires:	libpagemaker-devel
-BuildRequires:	libqxp-devel
-BuildRequires:	librevenge-devel
-BuildRequires:	libvisio-devel
-BuildRequires:	libwpd-devel
-BuildRequires:	libwpg-devel
-BuildRequires:	libxml2-devel
-# Dependency needed for development repository
-BuildRequires:	libzmf-devel
-BuildRequires:	OpenSceneGraph-devel
-BuildRequires:	openssl-devel
-BuildRequires:	podofo-devel
-BuildRequires:	poppler-cpp-devel
-BuildRequires:	poppler-data-devel
-BuildRequires:	poppler-devel
-BuildRequires:	pkgconfig(python3)
-BuildRequires: python3-setuptools
-BuildRequires:	python3-pillow-devel
-BuildRequires:	python3-qt5-devel
-BuildRequires:	python3-tkinter
-BuildRequires:	qt5-qtbase-devel
-BuildRequires:	qt5-qtdeclarative-devel
-BuildRequires:	qt5-qttools-devel
-BuildRequires:	qt5-qtwebkit-devel
-BuildRequires:	tk-devel
-
-# Some libraries have pkconfig files so use them
-BuildRequires:	pkgconfig(cairo)
-BuildRequires:	pkgconfig(fontconfig)
-BuildRequires:	pkgconfig(freetype2)
-BuildRequires:	pkgconfig(gnutls)
-BuildRequires:	pkgconfig(harfbuzz)
-BuildRequires:	pkgconfig(icu-uc)
-BuildRequires:	pkgconfig(libpng)
-BuildRequires:	pkgconfig(libtiff-4)
-BuildRequires:	pkgconfig(zlib)
+Patch2:         scribus-ctorfix.patch
+
+BuildRequires:  boost-devel
+BuildRequires:  cmake
+BuildRequires:  cups-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:  gcc-c++
+BuildRequires:  ghostscript
+BuildRequires:  hyphen-devel
+BuildRequires:  libappstream-glib
+BuildRequires:  pkgconfig(cairo)
+BuildRequires:  pkgconfig(fontconfig)
+BuildRequires:  pkgconfig(freetype2)
+BuildRequires:  pkgconfig(gnutls)
+BuildRequires:  pkgconfig(GraphicsMagick)
+BuildRequires:  pkgconfig(GraphicsMagick++)
+BuildRequires:  pkgconfig(harfbuzz)
+BuildRequires:  pkgconfig(hunspell)
+BuildRequires:  pkgconfig(icu-uc)
+BuildRequires:  pkgconfig(lcms2)
+BuildRequires:  pkgconfig(libcdr-0.1)
+BuildRequires:  pkgconfig(libfreehand-0.1)
+BuildRequires:  pkgconfig(libjpeg)
+BuildRequires:  pkgconfig(libmspub-0.1)
+BuildRequires:  pkgconfig(libpagemaker-0.0)
+BuildRequires:  pkgconfig(libpng)
+BuildRequires:  pkgconfig(libpodofo)
+BuildRequires:  pkgconfig(libqxp-0.0)
+BuildRequires:  pkgconfig(librevenge-0.0)
+BuildRequires:  pkgconfig(libtiff-4)
+BuildRequires:  pkgconfig(libvisio-0.1)
+BuildRequires:  pkgconfig(libwpd-0.10)
+BuildRequires:  pkgconfig(libwpg-0.3)
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(libzmf-0.0)
+BuildRequires:  pkgconfig(openscenegraph)
+BuildRequires:  pkgconfig(openssl)
+BuildRequires:  pkgconfig(poppler)
+BuildRequires:  pkgconfig(poppler-cpp)
+BuildRequires:  pkgconfig(poppler-data)
+BuildRequires:  pkgconfig(python3)
+BuildRequires:  pkgconfig(Qt5)
+BuildRequires:  pkgconfig(Qt5Quick)
+BuildRequires:  pkgconfig(Qt5UiTools)
+BuildRequires:  pkgconfig(Qt5WebKit)
+BuildRequires:  pkgconfig(tk)
+BuildRequires:  pkgconfig(zlib)
+BuildRequires:  python3dist(pillow)
+BuildRequires:  python3-qt5-devel
+BuildRequires:  python3dist(setuptools)
+BuildRequires:  python3dist(tkinter)
+
 
 %filter_provides_in %{_libdir}/%{name}/plugins
 %filter_setup
@@ -87,8 +85,8 @@ import/export and creation of color separations.
 
 
 %package        devel
-Summary:	Header files for Scribus
-Requires:	%{name} = %{version}-%{release}
+Summary:        Header files for Scribus
+Requires:       %{name} = %{version}-%{release}
 
 %description    devel
 #Header files for Scribus.
@@ -101,21 +99,21 @@ 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
+        %{name}/plugins/scriptplugin/{samples,scripts}/*.py
 
 %build
 %cmake  -DWANT_CCACHE=YES \
-	-DWANT_DISTROBUILD=YES \
-	-DWANT_GRAPHICSMAGICK=1 \
-	-DWANT_HUNSPELL=1 \
+        -DWANT_DISTROBUILD=YES \
+        -DWANT_GRAPHICSMAGICK=1 \
+        -DWANT_HUNSPELL=1 \
 %if "%{_lib}" == "lib64"
-	-DWANT_LIB64=YES \
+        -DWANT_LIB64=YES \
 %endif
-	-DWANT_NORPATH=1 \
-	-DWITH_BOOST=1 \
-	-DWITH_PODOFO=1 ..
+        -DWANT_NORPATH=1 \
+        -DWITH_BOOST=1 \
+        -DWITH_PODOFO=1 ..
 
-%cmake_build
+%cmake_build VERBOSE=1
 
 %install
 %cmake_install
@@ -125,7 +123,7 @@ find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
 %check
 desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 appstream-util validate-relax --nonet \
-	%{buildroot}%{_metainfodir}/%{name}.appdata.xml
+        %{buildroot}%{_metainfodir}/%{name}.appdata.xml
 
 
 %files
@@ -154,6 +152,10 @@ appstream-util validate-relax --nonet \
 
 
 %changelog
+* Tue Nov 05 2019 Luya Tshimbalanga <luya@fedoraproject.org> - 1.5.6-0.14
+- Further implement pkgconfig for build requirement
+- Use python3dist macro for some build requirement
+
 * Mon Oct 05 2020 Than Ngo <than@redhat.com> - 1.5.6-0.13
 - add BR on python3-setuptools explicitly