- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.cvsignore

@@ -1 +0,0 @@
-scribus-1.3.5.1.tar.bz2

.gitignore

@@ -0,0 +1,11 @@
+scribus-1.3.7.tar.bz2
+scribus-1.3.8.tar.bz2
+/scribus-1.3.9.tar.bz2
+/scribus-1.4.0.tar.bz2
+/scribus-1.4.1.tar.xz
+/scribus-1.4.1.tar.xz.asc
+/scribus-1.4.2-free.tar.xz
+/scribus-1.4.3-free.tar.xz
+/scribus-1.4.4-free.tar.xz
+/scribus-1.4.5-free.tar.xz
+/scribus-1.4.6-free.tar.xz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: scribus
-# $Id$
-NAME := scribus
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON	:= $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

make-free-archive.sh

@@ -0,0 +1,54 @@
+#! /bin/sh
+
+if [ -z "$1" ]; then
+    echo "version required"
+    exit 1
+fi
+
+version=$1
+nv=scribus-${version}
+
+archive=${nv}.tar.xz
+freearchive=${nv}-free.tar.xz
+
+[ -f ${archive} ] || curl -OL http://downloads.sourceforge.net/scribus/scribus-${version}.tar.xz
+
+echo "Extracting sources ..."
+rm -rf ${nv}
+tar -xJf $archive
+
+pushd ${nv}
+
+# remove docs
+rm -r scribus/doc
+
+# remove non-free profile
+rm scribus/profiles/{sRGB.icm,srgb.license}
+
+# remove non-free content from swatches
+rm resources/swatches/*.eps
+rm resources/swatches/dtp-studio-free-palettes-license.rtf
+
+rm resources/swatches/Galaxy_*
+rm resources/swatches/Resene_*
+rm resources/swatches/COPYING_RESENE.txt
+rm resources/swatches/NAA*
+
+rm resources/swatches/GiveLife_Color_System_*.xml
+rm resources/swatches/givelife_colors_license.rtf
+
+rm resources/swatches/Federal_Identity_Program.xml
+
+# Remove non-free (CC-BY-SA-NC) dot files
+rm resources/editorconfig/dot.*
+
+# Remove non-free dic files
+rm resources/dicts/hyph_fi.dic
+
+# Remove license unknown dic files
+rm resources/dicts/hyph_ia.dic resources/dicts/hyph_sv.dic
+
+popd
+
+echo "Creating sources ..."
+tar cf - ${nv} | xz > ${freearchive}

scribus-1.3.5-system-hyphen.patch

@@ -1,105 +0,0 @@
-diff -Nrup scribus-1.3.5.rc3.orig/cmake/modules/FindHYPHEN.cmake scribus-1.3.5.rc3/cmake/modules/FindHYPHEN.cmake
---- scribus-1.3.5.rc3.orig/cmake/modules/FindHYPHEN.cmake	1970-01-01 01:00:00.000000000 +0100
-+++ scribus-1.3.5.rc3/cmake/modules/FindHYPHEN.cmake	2009-07-02 14:23:26.000000000 +0200
-@@ -0,0 +1,28 @@
-+# - Find HYPHEN library
-+# Find the native HYPHEN includes and library
-+# This module defines
-+#  HYPHEN_INCLUDE_DIR, where to find hyphen.h, etc.
-+#  HYPHEN_LIBRARIES, libraries to link against to use HYPHEN.
-+#  HYPHEN_FOUND, If false, do not try to use HYPHEN.
-+# also defined, but not for general use are
-+#  HYPHEN_LIBRARY, where to find the HYPHEN library.
-+
-+FIND_PATH(HYPHEN_INCLUDE_DIR hyphen.h)
-+
-+SET(HYPHEN_NAMES_RELEASE ${HYPHEN_NAMES_RELEASE} ${HYPHEN_NAMES} hyphen libhyphen)
-+SET(HYPHEN_NAMES_DEBUG ${HYPHEN_NAMES_DEBUG} hyphend libhyphend)
-+
-+FIND_LIBRARY(HYPHEN_LIBRARY_RELEASE NAMES ${HYPHEN_NAMES_RELEASE} )
-+FIND_LIBRARY(HYPHEN_LIBRARY_DEBUG NAMES ${HYPHEN_NAMES_DEBUG} )
-+
-+INCLUDE(LibraryDebugAndRelease)
-+SET_LIBRARY_FROM_DEBUG_AND_RELEASE(HYPHEN)
-+
-+# handle the QUIETLY and REQUIRED arguments and set HYPHEN_FOUND to TRUE if 
-+# all listed variables are TRUE
-+INCLUDE(ScribusFindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(HYPHEN DEFAULT_MSG HYPHEN_LIBRARY HYPHEN_INCLUDE_DIR)
-+
-+IF(HYPHEN_FOUND)
-+  SET( HYPHEN_LIBRARIES ${HYPHEN_LIBRARY} )
-+ENDIF(HYPHEN_FOUND)
---- scribus-1.3.5.rc3.orig/CMakeLists.txt	2009-05-30 14:38:09.000000000 +0200
-+++ scribus-1.3.5.rc3/CMakeLists.txt	2009-07-02 14:32:24.000000000 +0200
-@@ -638,6 +638,16 @@ ELSE(LIBPODOFO_FOUND)
- ENDIF(LIBPODOFO_FOUND)
- #>>PoDoFo for AI PDF import
- 
-+#<<HYPHEN for system hyphenation library
-+FIND_PACKAGE(HYPHEN)
-+IF(HYPHEN_FOUND)
-+  MESSAGE("system hyphenation library found OK")
-+  SET(HAVE_HYPHEN 1)
-+ELSE(HYPHEN_FOUND)
-+  MESSAGE("system hyphenation library NOT found - will use internal one")
-+ENDIF(HYPHEN_FOUND)
-+#>>HYPHEN for system hyphenation library
-+
- ##############################################################################################################
- ########## Include Setup                                                                            ##########
- 
-diff -Nrup -x CMakeFiles -x Makefile -x FindHYPHEN.cmake scribus-1.3.5.rc3.orig/scribus/CMakeLists.txt scribus-1.3.5.rc3/scribus/CMakeLists.txt
---- scribus-1.3.5.rc3.orig/scribus/CMakeLists.txt	2009-06-07 09:05:54.000000000 +0200
-+++ scribus-1.3.5.rc3/scribus/CMakeLists.txt	2009-07-02 15:22:52.000000000 +0200
-@@ -403,10 +403,8 @@ SET(SCRIBUS_SOURCES
-   guidesdelegate.cpp
-   guidesmodel.cpp
-   helpbrowser.cpp
--  hnjalloc.c
-   hruler.cpp
-   hyask.cpp
--  hyphen.c
-   hyphenator.cpp
-   hysettings.cpp
-   imageinfodialog.cpp
-@@ -641,6 +639,14 @@ SET(SCRIBUS_SOURCES
-   vruler.cpp
- )
- 
-+IF(NOT HAVE_HYPHEN)
-+  SET(SCRIBUS_SOURCES
-+    ${SCRIBUS_SOURCES}
-+    hnjalloc.c
-+    hyphen.c
-+  )
-+ENDIF(NOT HAVE_HYPHEN)
-+
- IF(WIN32)
-   SET(SCRIBUS_MOC_WIN32_ONLY_CLASSES scprintengine_gdi.h)
-   SET(SCRIBUS_WIN32_ONLY_SOURCES
-@@ -785,6 +791,12 @@ IF(HAVE_PODOFO)
-   )
- ENDIF(HAVE_PODOFO)
- 
-+IF(HAVE_HYPHEN)
-+  TARGET_LINK_LIBRARIES(${EXE_NAME}
-+    ${HYPHEN_LIBRARY}
-+  )
-+ENDIF(HAVE_HYPHEN)
-+
- # Now build plugins
- SET(PLUGIN_LIBRARIES)
- IF(WIN32)
-diff -Nrup -x CMakeFiles -x Makefile -x '*.cmake' scribus-1.3.5.rc3.orig/scribus/hyphenator.h scribus-1.3.5.rc3/scribus/hyphenator.h
---- scribus-1.3.5.rc3.orig/scribus/hyphenator.h	2007-07-10 22:33:09.000000000 +0200
-+++ scribus-1.3.5.rc3/scribus/hyphenator.h	2009-07-02 14:03:11.000000000 +0200
-@@ -13,7 +13,7 @@ for which a new license (GPL+exception) 
- #include <QSet>
- 
- #include "scribusapi.h"
--#include "hyphen.h"
-+#include <hyphen.h>
- class ScribusDoc;
- class ScribusMainWindow;
- class PageItem;

scribus-1.4.2-nonfree.patch

@@ -0,0 +1,60 @@
+Index: scribus-1.4.2/scribus/CMakeLists.txt
+===================================================================
+--- scribus-1.4.2.orig/scribus/CMakeLists.txt
++++ scribus-1.4.2/scribus/CMakeLists.txt
+@@ -2,7 +2,6 @@ IF(WIN32)
+   ADD_DEFINITIONS(-DQT_DLL)
+ ENDIF(WIN32)
+ 
+-ADD_SUBDIRECTORY(doc)
+ ADD_SUBDIRECTORY(dtd)
+ ADD_SUBDIRECTORY(manpages)
+ ADD_SUBDIRECTORY(colormgmt)
+Index: scribus-1.4.2/scribus/helpbrowser.cpp
+===================================================================
+--- scribus-1.4.2.orig/scribus/helpbrowser.cpp
++++ scribus-1.4.2/scribus/helpbrowser.cpp
+@@ -716,7 +716,7 @@ QString HelpBrowser::historyFile()
+ 
+ void HelpBrowser::displayNoHelp()
+ {
+-	QString noHelpMsg=tr("<h2><p>Sorry, no manual is installed!</p><p>Please see:</p><ul><li>http://docs.scribus.net for updated documentation</li><li>http://www.scribus.net for downloads</li></ul></h2>",
++	QString noHelpMsg=tr("<h2><p>Sorry, the manual is not installed because it is not freely distributable and thus can't be included in Fedora!</p><p>Please see:</p><ul><li>http://docs.scribus.net for updated documentation</li><li>http://www.scribus.net for downloads</li></ul></h2>",
+ 						 "HTML message for no documentation available to show");
+ 
+ 	textBrowser->setText(noHelpMsg);
+Index: scribus-1.4.2/scribus/profiles/CMakeLists.txt
+===================================================================
+--- scribus-1.4.2.orig/scribus/profiles/CMakeLists.txt
++++ scribus-1.4.2/scribus/profiles/CMakeLists.txt
+@@ -6,7 +6,5 @@ INSTALL(FILES
+ GenericCMYK.icm
+ GenericCMYK.txt
+ Readme
+-sRGB.icm
+-srgb.license
+   DESTINATION ${SHAREDIR}profiles
+ )
+diff -up scribus-1.4.4/resources/editorconfig/CMakeLists.txt.no-dot scribus-1.4.4/resources/editorconfig/CMakeLists.txt
+--- scribus-1.4.4/resources/editorconfig/CMakeLists.txt.no-dot	2014-06-06 17:22:12.258966553 -0400
++++ scribus-1.4.4/resources/editorconfig/CMakeLists.txt	2014-06-06 17:22:16.326936717 -0400
+@@ -12,7 +12,6 @@ gnuplot.png
+ 300_lilypond.xml
+ lilypond.png
+ 400_dot.xml
+-dot.svg
+ 500_povray.xml
+ povray_32.png
+ 
+diff -up scribus-1.4.5/resources/swatches/CMakeLists.txt.nonfree scribus-1.4.5/resources/swatches/CMakeLists.txt
+--- scribus-1.4.5/resources/swatches/CMakeLists.txt.nonfree	2016-01-12 17:41:12.379774049 -0500
++++ scribus-1.4.5/resources/swatches/CMakeLists.txt	2016-01-12 17:41:22.219677148 -0500
+@@ -8,7 +8,7 @@ FILE( GLOB EPS_PALETTES *.eps )
+ FILE( GLOB RTF_LICENSES *.rtf )
+ 
+ #Avoid CMakeLists.txt
+-SET(TXT_LICENSES "${CMAKE_CURRENT_SOURCE_DIR}/COPYING_RESENE.txt" "${CMAKE_CURRENT_SOURCE_DIR}/Japanese_Traditional_README.txt")
++SET(TXT_LICENSES "${CMAKE_CURRENT_SOURCE_DIR}/Japanese_Traditional_README.txt")
+ 
+ INSTALL(FILES ${GIMP_STYLE_PALETTES} ${XML_PALETTES} ${EPS_PALETTES} ${RTF_LICENSES} ${TXT_LICENSES}
+  DESTINATION ${SHAREDIR}swatches

scribus-1.4.4-qreal_double.patch

@@ -0,0 +1,138 @@
+Description: Avoid qreal/double type clashes on ARM
+Author: Colin Watson <cjwatson@ubuntu.com>
+Forwarded: no
+Last-Update: 2013-05-16
+
+--- scribus-1.4.2.dfsg+r18267.orig/scribus/scribus.h
++++ scribus-1.4.2.dfsg+r18267/scribus/scribus.h
+@@ -466,7 +466,7 @@ public slots:
+ 	/** Fragt nach den Farben */
+ //	void GetBrushPen();
+ 	/** Erzeugt einen Rahmen */
+-	void MakeFrame(int f, int c, double *vals);
++	void MakeFrame(int f, int c, qreal *vals);
+ 	//** Loescht ein Element */
+ 	//void DeleteObjekt();
+ 	/** Duplicate current item */
+--- scribus-1.4.2.dfsg+r18267.orig/scribus/pageitem.cpp
++++ scribus-1.4.2.dfsg+r18267/scribus/pageitem.cpp
+@@ -4597,7 +4597,7 @@ void PageItem::copyToCopyPasteBuffer(str
+ 
+ 
+ //Moved from View
+-void PageItem::SetFrameShape(int count, double *vals)
++void PageItem::SetFrameShape(int count, qreal *vals)
+ {
+ 	PoLine.resize(0);
+ 	for (int a = 0; a < count-3; a += 4)
+@@ -4620,7 +4620,7 @@ void PageItem::SetFrameShape(int count,
+ 
+ void PageItem::SetRectFrame()
+ {
+-	static double rect[] = {  0.0,   0.0,   0.0,   0.0,
++	static qreal rect[] = {  0.0,   0.0,   0.0,   0.0,
+ 							100.0,   0.0, 100.0,   0.0,
+ 							100.0,   0.0, 100.0,   0.0,
+ 							100.0, 100.0, 100.0, 100.0,
+@@ -4635,7 +4635,7 @@ void PageItem::SetRectFrame()
+ 
+ void PageItem::SetOvalFrame()
+ {
+-	static double rect[] = {   100.0,  50.0, 100.0,       77.615235,
++	static qreal rect[] = {   100.0,  50.0, 100.0,       77.615235,
+ 								50.0, 100.0,  77.615235, 100.0,
+ 								50.0, 100.0,  22.385765, 100.0,
+ 								 0.0,  50.0,   0.0,       77.615235,
+--- scribus-1.4.2.dfsg+r18267.orig/scribus/pageitem.h
++++ scribus-1.4.2.dfsg+r18267/scribus/pageitem.h
+@@ -298,7 +298,7 @@ protected:
+ 	void DrawObj_PathText(ScPainter *p, double sc);
+ public:
+ 	void DrawObj_Embedded(ScPainter *p, QRectF e, const CharStyle& style, PageItem* cembedded);
+-	void SetFrameShape(int count, double *vals);
++	void SetFrameShape(int count, qreal *vals);
+ 	void SetRectFrame();
+ 	void SetOvalFrame();
+ 	void SetFrameRound();
+--- scribus-1.4.2.dfsg+r18267.orig/scribus/propertiespalette.cpp
++++ scribus-1.4.2.dfsg+r18267/scribus/propertiespalette.cpp
+@@ -4622,7 +4622,7 @@ void PropertiesPalette::MakeIrre(int f,
+ 			doc->setRedrawBounding(CurItem);
+ 			break;
+ 		default:
+-			CurItem->SetFrameShape(c, (double*)vals);
++			CurItem->SetFrameShape(c, vals);
+ 			doc->setRedrawBounding(CurItem);
+ 			CurItem->FrameType = f+2;
+ 			break;
+--- scribus-1.4.2.dfsg+r18267.orig/scribus/scribusdoc.h
++++ scribus-1.4.2.dfsg+r18267/scribus/scribusdoc.h
+@@ -1005,7 +1005,7 @@ public: // Public attributes
+ 	DocumentInformation documentInfo;
+ 	int appMode;
+ 	int SubMode;
+-	double *ShapeValues;
++	qreal *ShapeValues;
+ 	int ValCount;
+ 	QString DocName;
+ 	QMap<QString,int> UsedFonts;
+--- scribus-1.4.2.dfsg+r18267.orig/scribus/canvasmode_create.cpp
++++ scribus-1.4.2.dfsg+r18267/scribus/canvasmode_create.cpp
+@@ -122,7 +122,7 @@ void CreateMode::drawControls(QPainter*
+ 		{
+ 			FPointArray poly;
+ 			int valCount = m_doc->ValCount;
+-			double *vals = m_doc->ShapeValues;
++			qreal *vals = m_doc->ShapeValues;
+ 			for (int a = 0; a < valCount-3; a += 4)
+ 			{
+ 				if (vals[a] < 0)
+--- scribus-1.4.2.dfsg+r18267.orig/scribus/scribus.cpp
++++ scribus-1.4.2.dfsg+r18267/scribus/scribus.cpp
+@@ -7599,7 +7599,7 @@ void ScribusMainWindow::GetBrushPen()
+ }
+ */
+ //CB-->??
+-void ScribusMainWindow::MakeFrame(int f, int c, double *vals)
++void ScribusMainWindow::MakeFrame(int f, int c, qreal *vals)
+ {
+ 	PageItem *currItem = doc->m_Selection->itemAt(0);
+ 	switch (f)
+--- scribus-1.4.2.dfsg+r18267.orig/scribus/plugins/imposition/imposition.cpp
++++ scribus-1.4.2.dfsg+r18267/scribus/plugins/imposition/imposition.cpp
+@@ -542,7 +542,7 @@ void Imposition::booklet4p(QList<int>* p
+ 					}
+ 					groupcontrol->SetRectFrame();
+ 					
+-					double points[32] = {
++					qreal points[32] = {
+ 					//left upper corner - left lower corner
+ 					targetDoc->Pages->at(0)->guides.vertical(1,targetDoc->Pages->at(0)->guides.Standard),
+ 					targetDoc->Pages->at(0)->guides.horizontal(0,targetDoc->Pages->at(i)->guides.Standard),
+@@ -730,7 +730,7 @@ void Imposition::booklet4p(QList<int>* p
+ 					}
+ 					groupcontrol->SetRectFrame();
+ 					
+-					double points[32] = {
++					qreal points[32] = {
+ 					//left upper corner - left lower corner
+ 					0,
+ 					0,
+@@ -893,7 +893,7 @@ void Imposition::booklet4p(QList<int>* p
+ 					}
+ 					groupcontrol->SetRectFrame();
+ 					
+-					double points[32] = {
++					qreal points[32] = {
+ 					//left upper corner - left lower corner
+ 					0,
+ 					0,
+@@ -1047,7 +1047,7 @@ void Imposition::booklet4p(QList<int>* p
+ 					}
+ 					groupcontrol->SetRectFrame();
+ 					
+-					double points[32] = {
++					qreal points[32] = {
+ 					//left upper corner - left lower corner
+ 					targetDoc->Pages->at(0)->guides.vertical(1,targetDoc->Pages->at(0)->guides.Standard),
+ 					targetDoc->Pages->at(0)->guides.horizontal(0,targetDoc->Pages->at(i)->guides.Standard),

scribus-1.4.5-lppl-fixes.patch

@@ -0,0 +1,36 @@
+diff -up scribus-1.4.5/resources/dicts/README_hyph_da_DK.txt.lppl scribus-1.4.5/resources/dicts/README_hyph_da_DK.txt
+--- scribus-1.4.5/resources/dicts/README_hyph_da_DK.txt.lppl	2015-05-07 16:50:30.664715518 -0400
++++ scribus-1.4.5/resources/dicts/README_hyph_da_DK.txt	2015-05-07 16:50:53.288550546 -0400
+@@ -3,6 +3,9 @@ Hyphenation dictionary
+ 
+ Language: Danish (da DK).  
+ Origin:   Based on the TeX hyphenation tables 
++          http://www.ctan.org/tex-archive/language/hyphenation/dkhyphn/dkhyphn.tex
++          The TeX hyphenation tables are released under the LaTeX Project
++          Public License (LPPL)
+ License:  GNU LGPL license.  
+ Author:   conversion author is Marco Huggenberger<marco@by-night.ch> 
+ 
+diff -up scribus-1.4.5/resources/dicts/README_is_IS.txt.lppl scribus-1.4.5/resources/dicts/README_is_IS.txt
+--- scribus-1.4.5/resources/dicts/README_is_IS.txt.lppl	2015-05-07 16:51:32.623263721 -0400
++++ scribus-1.4.5/resources/dicts/README_is_IS.txt	2015-05-07 16:51:53.072114610 -0400
+@@ -2,15 +2,14 @@ Hyphenation dictionary
+ ----------------------
+ 
+ Language: Icelandic (Iceland) (is IS).
+-Origin:   Based on the TeX hyphenation tables
++Origin:   Based on the TeX hyphenation tables by J�rgen Pind (1987).
++          http://www.ctan.org/tex-archive/language/hyphenation/dkhyphn/dkhyphn.tex
++          The TeX hyphenation tables are released under the LaTeX Project
++          Public License (LPPL)
+ License:  LGPL/SISSL license, 2003
+ Author:   akig@hi.is (Áki G. Karlsson)
+ 
+ HYPH is IS hyph_is_IS
+-
+-
+- These patterns were converted from TeX hyphenation patterns by Jörgen Pind
+- (1987).
+  
+  -- 
+  Áki G. Karlsson

scribus-1.4.6-gs-9.24.patch

@@ -0,0 +1,10 @@
+--- scribus-1.4.6-orig/scribus/plugins/import/ps/import.prolog	2009-05-08 21:04:32.000000000 +0200
++++ scribus-1.4.6/scribus/plugins/import/ps/import.prolog	2018-09-17 16:05:24.988900385 +0200
+@@ -75,6 +75,7 @@
+ 	//doimage exec
+ } .forceput
+ end
++/.currentopacityalpha {//.currentopacityalpha} bind def
+ setglobal
+ .bindnow
+ 

scribus-1.4.6-hunspell.patch

@@ -0,0 +1,12 @@
+--- a/cmake/modules/FindHUNSPELL.cmake
++++ b/cmake/modules/FindHUNSPELL.cmake
+@@ -9,7 +9,7 @@
+ #Based on examples at http://www.vtk.org/Wiki/CMake:How_To_Find_Libraries
+ 
+ FIND_PATH(HUNSPELL_INCLUDE_DIR hunspell/hunspell.hxx )
+-FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.3 hunspell-1.2 PATHS /opt/local/lib /usr/local/lib /usr/lib )
++FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.7 hunspell-1.6 hunspell-1.5 hunspell-1.4 hunspell-1.3 hunspell-1.2 PATHS /opt/local/lib /usr/local/lib /usr/lib )
+ 
+ INCLUDE(FindPackageHandleStandardArgs)
+ # handle the QUIETLY and REQUIRED arguments and set HUNSPELL_FOUND to TRUE
+

scribus.spec

@@ -1,44 +1,55 @@
 Name:           scribus
-Version:        1.3.5.1
-Release:        4%{?dist}
-
+Version:        1.4.6
+Release:        17%{?dist}
 Summary:        DeskTop Publishing application written in Qt
-
-Group:          Applications/Productivity
-License:        GPLv2+
+# 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+ 
 URL:            http://www.scribus.net/
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-Patch0:         %{name}-1.3.5-system-hyphen.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# ./make-free-archive %{version}
+Source0:        %{name}-%{version}-free.tar.xz
+#Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
+#Source1:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz.asc
+Source2:        scribus.png
+Patch1:         %{name}-1.4.4-qreal_double.patch
+# fix build with non-free content removed
+Patch2:         %{name}-1.4.2-nonfree.patch
+# Fix necessary LPPL attribution
+Patch3:         %{name}-1.4.5-lppl-fixes.patch
+# Fix detection of hunspell-1.4+
+Patch4:         %{name}-1.4.6-hunspell.patch
+Patch5:         %{name}-1.4.6-gs-9.24.patch
 
 BuildRequires:  cmake
-
 BuildRequires:  cups-devel
 BuildRequires:  desktop-file-utils
-BuildRequires:  lcms-devel
+BuildRequires:  lcms2-devel
 BuildRequires:  libart_lgpl-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  openssl-devel
-BuildRequires:  python-devel
-BuildRequires:  python-imaging-devel
-BuildRequires:  qt-devel
+BuildRequires:  python2-devel
+BuildRequires:  python2-imaging-devel
+BuildRequires:  qt4-devel
 BuildRequires:  zlib-devel
 BuildRequires:  freetype-devel
 BuildRequires:  gnutls-devel
 BuildRequires:  cairo-devel
-BuildRequires:  aspell-devel
+BuildRequires:  hunspell-devel
 BuildRequires:  boost-devel
 BuildRequires:  podofo-devel
 BuildRequires:  hyphen-devel
 Requires:       ghostscript
-Requires:       python
-Requires:       python-imaging
-Requires:       tkinter
+Requires:       python2
+Requires:       python2-imaging
+Requires:       python2-tkinter
 Requires:       shared-mime-info
-Requires:       %{name}-doc = %{version}-%{release}
+Obsoletes:      %{name}-doc < %{version}-%{release}
+Obsoletes:      %{name}-devel < %{version}-%{release}
+
+%filter_provides_in %{_libdir}/%{name}/plugins
+%filter_setup
 
 
 %description
@@ -52,30 +63,13 @@ features, such as CMYK color, easy PDF creation, Encapsulated Postscript
 import/export and creation of color separations.
 
 
-%package        devel
-Summary:        Header files for Scribus
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-
-%description    devel
-Header files for Scribus.
-
-%package        doc
-Summary:        Documentation files for Scribus
-Group:          Development/Tools
-Requires:       %{name} = %{version}-%{release}
-%if 0%{?fedora} > 9
-BuildArch:      noarch
-Obsoletes:      %{name}-doc < 1.3.5-0.12.beta
-%endif
-
-
-%description    doc
-%{summary}
-
 %prep
-%setup -q -n %{name}-%{version}
-%patch0 -p1 -b .system-hyphen
+%setup -q
+%patch1 -p1 -b .double
+%patch2 -p1 -b .nonfree
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 # recode man page to UTF-8
 pushd scribus/manpages
@@ -99,90 +93,313 @@ done
 %build
 mkdir build
 pushd build
-%cmake ..
+%cmake -DWANT_DISTROBUILD=YES -DWANT_HUNSPELL=YES -DWANT_NOHEADERINSTALL=YES ..
 
-%ifnarch s390x
 make VERBOSE=1 %{?_smp_mflags}
-%else
-# we can't use parallel build on s390x, because g++ eats almost all memory
-# in the builder (2+0.5 GB) when compiling scribus134format.cpp
-make VERBOSE=1
-%endif
 popd
 
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
 pushd build
 make install DESTDIR=$RPM_BUILD_ROOT
 popd
 
-install -p -D -m0644 ${RPM_BUILD_ROOT}%{_datadir}/scribus/icons/scribus.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/scribus.png
+install -p -D -m0644 %SOURCE2 ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/scribus.png
 install -p -D -m0644 ${RPM_BUILD_ROOT}%{_datadir}/scribus/icons/scribusdoc.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/x-scribus.png
 
 find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
 
 # install the global desktop file
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/mimelnk/application/*scribus.desktop
-desktop-file-install --vendor="fedora"                      \
+desktop-file-install \
+%if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7)
+    --vendor="fedora"                      \
+%endif
     --dir=${RPM_BUILD_ROOT}%{_datadir}/applications         \
     scribus.desktop
 
+# remove unwanted stuff
+rm -rf ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}
 
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
-
-%post
-update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
-
-
-%postun
-update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
-
+# Register as an application to be visible in the software center
+#
+# NOTE: It would be *awesome* if this file was maintained by the upstream
+# project, translated and installed into the right place during `make install`.
+#
+# See http://www.freedesktop.org/software/appstream/docs/ for more details.
+#
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
+cat > $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml <<EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
+<!--
+BugReportURL: http://bugs.scribus.net/view.php?id=12708
+SentUpstream: 2014-09-18
+-->
+<application>
+  <id type="desktop">scribus.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <description>
+    <p>
+      Scribus is a desktop publishing application that allows you to create posters,
+      magazines and books ready to send off to a printing house.
+      It supports professional publishing features, such color separations, CMYK and
+      spot colors, ICC color management, and versatile PDF creation.
+    </p>
+    <!-- FIXME: Probably needs another paragraph or two -->
+  </description>
+  <url type="homepage">http://scribus.net/</url>
+  <screenshots>
+    <screenshot type="default">http://upload.wikimedia.org/wikipedia/commons/f/f4/Scribus-1.3-Linux.png</screenshot>
+  </screenshots>
+  <!-- FIXME: change this to an upstream email address for spec updates
+  <updatecontact>someone_who_cares@upstream_project.org</updatecontact>
+   -->
+</application>
+EOF
 
 %files
-%defattr(-,root,root,-)
-%doc %{_datadir}/doc/%{name}-%{version}/AUTHORS
-%doc %{_datadir}/doc/%{name}-%{version}/ChangeLog
-%doc %{_datadir}/doc/%{name}-%{version}/ChangeLogSVN
-%doc %{_datadir}/doc/%{name}-%{version}/COPYING
-%doc %{_datadir}/doc/%{name}-%{version}/README
-%doc %{_datadir}/doc/%{name}-%{version}/TODO
+%doc AUTHORS ChangeLog COPYING LINKS README
 %{_bindir}/%{name}
-%{_libdir}/%{name}
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_libdir}/%{name}/
+%{_datadir}/appdata/*%{name}.appdata.xml
+%{_datadir}/applications/*%{name}.desktop
 %{_datadir}/mime/packages/%{name}.xml
 %{_datadir}/pixmaps/*
-%{_datadir}/%{name}
+%{_datadir}/%{name}/
 %exclude %{_datadir}/%{name}/samples/*.py[co]
 %exclude %{_datadir}/%{name}/scripts/*.py[co]
 %{_mandir}/man1/*
 %{_mandir}/pl/man1/*
 %{_mandir}/de/man1/*
 
-%files devel
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{_includedir}/%{name}
-
-%files doc
-%defattr(-,root,root,-)
-%dir %{_datadir}/doc/%{name}-%{version}
-%lang(cs) %{_datadir}/doc/%{name}-%{version}/cs
-%lang(de) %{_datadir}/doc/%{name}-%{version}/de
-%lang(en) %{_datadir}/doc/%{name}-%{version}/en
-%lang(fr) %{_datadir}/doc/%{name}-%{version}/fr
-%lang(pl) %{_datadir}/doc/%{name}-%{version}/pl
-%{_datadir}/doc/%{name}-%{version}/BUILDING
-%{_datadir}/doc/%{name}-%{version}/NEWS
-%{_datadir}/doc/%{name}-%{version}/README*
-%{_datadir}/doc/%{name}-%{version}/PACKAGING
-%{_datadir}/doc/%{name}-%{version}/LINKS
-%{_datadir}/doc/%{name}-%{version}/TRANSLATION
-
 
 %changelog
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.6-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.6-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Tue Nov 13 2018 Caolán McNamara <caolanm@redhat.com> - 1.4.6-15
+- rebuild for hunspell-1.7.0
+
+* Mon Sep 17 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.4.6-14
+- fix EPS import (bz #1628943)
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.6-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Jul 11 2018 Sandro Mani <manisandro@gmail.com> - 1.4.6-12
+- Rebuild (podofo)
+
+* Mon Feb 12 2018 Iryna Shcherbina <ishcherb@redhat.com> - 1.4.6-11
+- Update Python 2 dependency declarations to new packaging standards
+  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.6-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.6-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.6-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Jul 07 2017 Igor Gnatenko <ignatenko@redhat.com> - 1.4.6-7
+- Rebuild due to bug in RPM (RHBZ #1468476)
+
+* Fri Apr 07 2017 Yaakov Selkowitz <yselkowi@redhat.com> - 1.4.6-6
+- Fix detection of latest hunspell for spell-checking support (#1425305)
+
+* Mon Feb 06 2017 Kalev Lember <klember@redhat.com> - 1.4.6-5
+- Rebuilt for Boost 1.63
+
+* Thu Feb 02 2017 Sandro Mani <manisandro@gmail.com> - 1.4.6-4
+- Rebuild (podofo)
+
+* Fri Jan 27 2017 Jonathan Wakely <jwakely@redhat.com> - 1.4.6-3
+- Rebuilt for Boost 1.63
+
+* Fri Sep 23 2016 Jon Ciesla <limburgher@gmail.com> - 1.4.6-2
+- podofo rebuild.
+
+* Tue May 24 2016 Jon Ciesla <limburgher@gmail.com> - 1.4.6-1
+- 1.4.6
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.5-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Fri Jan 15 2016 Jonathan Wakely <jwakely@redhat.com> - 1.4.5-8
+- Rebuilt for Boost 1.60
+
+* Tue Jan 12 2016 Tom Callaway <spot@fedoraproject.org> - 1.4.5-7
+- fix license tag, remove found non-free swatches (bz 1297262)
+
+* Fri Sep 18 2015 Richard Hughes <rhughes@redhat.com> - 1.4.5-6
+- Use a bigger resolution application icon
+
+* Thu Aug 27 2015 Jonathan Wakely <jwakely@redhat.com> - 1.4.5-5
+- Rebuilt for Boost 1.59
+
+* Wed Jul 29 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159
+
+* Wed Jul 22 2015 David Tardon <dtardon@redhat.com> - 1.4.5-3
+- rebuild for Boost 1.58
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Thu May  7 2015 Tom Callaway <spot@fedoraproject.org> 1.4.5-1
+- update to 1.4.5
+- drop non-free and questionable hyphen dic files (bz 1219415)
+- fix necessary LPPL attributions
+
+* Thu Mar 26 2015 Richard Hughes <rhughes@redhat.com> - 1.4.4-7
+- Add an AppData file for the software center
+
+* Tue Jan 27 2015 Petr Machata <pmachata@redhat.com> - 1.4.4-6
+- Rebuild for boost 1.57.0
+
+* Thu Aug 28 2014 Dan Horák <dan[at]danny.cz> - 1.4.4-5
+- switch to Debian patch for the qreal vs double conflict on ARM (fixes #1076885)
+
+* Wed Aug 20 2014 Kevin Fenzi <kevin@scrye.com> - 1.4.4-4
+- Rebuild for rpm bug 1131892
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Aug 09 2014 Rex Dieter <rdieter@fedoraproject.org> 1.4.4-2
+- optimize/update scriptlets
+
+* Fri Jun  6 2014 Tom Callaway <spot@fedoraproject.org> - 1.4.4-1
+- update to 1.4.4, drop non-free dot files
+
+* Fri May 23 2014 Petr Machata <pmachata@redhat.com> - 1.4.3-3
+- Rebuild for boost 1.55.0
+
+* Thu Sep 19 2013 Dan Horák <dan[at]danny.cz> - 1.4.3-2
+- fix the double patch (#1009979)
+
+* Mon Aug 19 2013 Dan Horák <dan[at]danny.cz> - 1.4.3-1
+- update to 1.4.3 (#990030)
+- update for unversioned docdir
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Tue Jul 30 2013 Petr Machata <pmachata@redhat.com> - 1.4.2-6
+- Rebuild for boost 1.54.0
+
+* Mon Feb 25 2013 Toshio Kuratomi <toshio@fedoraproject.org> - 1.4.2-5
+- Remove --vendor from desktop-file-install for F19+ https://fedorahosted.org/fesco/ticket/1077
+
+* Wed Jan 30 2013 Dan Horák <dan[at]danny.cz> - 1.4.2-4
+- update for Pillow (#896301)
+
+* Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 1.4.2-3
+- rebuild due to "jpeg8-ABI" feature drop
+
+* Fri Jan 18 2013 Dan Horák <dan[at]danny.cz> - 1.4.2-2
+- use hunspell to be consistent with the rest of the system
+
+* Tue Jan 15 2013 Dan Horák <dan[at]danny.cz> - 1.4.2-1
+- update to 1.4.2
+- remove non-free content from source archive (#887221)
+- drop doc and devel sub-packages
+- switch to lcms2
+
+* Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 1.4.1-4
+- rebuild against new libjpeg
+
+* Thu Aug  9 2012 Peter Robinson <pbrobinson@fedoraproject.org> - 1.4.1-3
+- Add patch to fix FTBFS on ARM
+
+* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sun May 06 2012 Dan Horák <dan[at]danny.cz> - 1.4.1-1
+- update to 1.4.1
+
+* Wed Mar 07 2012 Dan Horák <dan[at]danny.cz> - 1.4.0-5
+- fix crash at export as image (rhbz#800765)
+
+* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.0-4
+- Rebuilt for c++ ABI breakage
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Tue Jan 03 2012 Dan Horák <dan[at]danny.cz> - 1.4.0-2
+- the swatches/profiles patches were submitted to upstream bugtracker
+
+* Mon Jan 02 2012 Dan Horák <dan[at]danny.cz> - 1.4.0-1.1
+- install profiles and swatches to datadir
+- use versioned docdir
+
+* Mon Jan 02 2012 Dan Horák <dan[at]danny.cz> - 1.4.0-1
+- update to 1.4.0
+
+* Fri Jun 24 2011 Dan Horák <dan@danny.cz> - 1.3.9-6
+- fix build with cups 1.5 (#716107)
+
+* Wed May 04 2011 Dan Horák <dan@danny.cz> - 1.3.9-5
+- rebuilt against podofo 0.9.1
+
+* Thu Apr 14 2011 Dan Horák <dan@danny.cz> - 1.3.9-4
+- rebuilt against podofo 0.9.0
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.9-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Dec 20 2010 Dan Horák <dan[AT]danny.cz> - 1.3.9-2
+- run update-desktop-database in scriptlets too (#664318)
+
+* Tue Nov 30 2010 Dan Horák <dan[AT]danny.cz> - 1.3.9-1
+- update to 1.3.9
+- filter unwanted Provides
+
+* Wed Nov 03 2010 Dan Horák <dan@danny.cz> - 1.3.8-3
+- rebuilt against podofo 0.8.4
+
+* Fri Oct 22 2010 Dan Horák <dan@danny.cz> - 1.3.8-2
+- rebuilt against podofo 0.8.3
+
+* Mon Aug 16 2010 Dan Horák <dan[AT]danny.cz> - 1.3.8-1
+- update to 1.3.8
+
+* Tue Jul 27 2010 David Malcolm <dmalcolm@redhat.com> - 1.3.7-5
+- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
+
+* Tue Jun 15 2010 Dan Horák <dan[AT]danny.cz> - 1.3.7-4
+- fix crash when selecting frame (#604124)
+
+* Tue Jun 15 2010 Dan Horák <dan[AT]danny.cz> - 1.3.7-3
+- show icons in shapes menu (#603921)
+
+* Tue Jun 08 2010 Dan Horák <dan[AT]danny.cz> - 1.3.7-2
+- rebuilt with podofo 0.8.1
+
+* Tue Jun  1 2010 Dan Horák <dan[AT]danny.cz> - 1.3.7-1
+- update to final 1.3.7
+
+* Thu Apr 29 2010 Dan Horák <dan[AT]danny.cz> - 1.3.6-4
+- fix build with podofo 0.8.0
+
+* Thu Apr 29 2010 Dan Horák <dan[AT]danny.cz> - 1.3.6-3
+- rebuilt for podofo 0.8.0
+
+* Wed Mar 31 2010 Dan Horák <dan[AT]danny.cz> - 1.3.6-2
+- added 2 patches for rawhide
+
+* Mon Mar 29 2010 Dan Horák <dan[AT]danny.cz> - 1.3.6-1
+- update to final 1.3.6
+
+* Wed Nov 25 2009 Dan Horák <dan[AT]danny.cz> - 1.3.5.1-5
+- fixed a crash when closing a hyphenator object (#537677)
+
 * Thu Aug 27 2009 Tomas Mraz <tmraz@redhat.com> - 1.3.5.1-4
 - rebuilt with new openssl
 

sources

@@ -1 +1 @@
-4cadca0c780491ad61dc2d815776f10b  scribus-1.3.5.1.tar.bz2
+106b2b55bfb87cab65d2d952dbaf7fea  scribus-1.4.6-free.tar.xz