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

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

.gitignore

@@ -7,3 +7,5 @@ scribus-1.3.8.tar.bz2
 /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

make-free-archive.sh

@@ -11,11 +11,11 @@ nv=scribus-${version}
 archive=${nv}.tar.xz
 freearchive=${nv}-free.tar.xz
 
-[ -f ${archive} ] || curl -O http://downloads.sourceforge.net/scribus/scribus-${version}.tar.xz
+[ -f ${archive} ] || curl -OL http://downloads.sourceforge.net/scribus/scribus-${version}.tar.xz
 
 echo "Extracting sources ..."
 rm -rf ${nv}
-xzcat $archive | tar xf -
+tar -xJf $archive
 
 pushd ${nv}
 
@@ -29,6 +29,11 @@ rm scribus/profiles/{sRGB.icm,srgb.license}
 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
 
@@ -37,6 +42,12 @@ 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 ..."

scribus-1.4.2-nonfree.patch

@@ -46,3 +46,15 @@ diff -up scribus-1.4.4/resources/editorconfig/CMakeLists.txt.no-dot scribus-1.4.
  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.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,22 +1,25 @@
 Name:           scribus
-Version:        1.4.4
+Version:        1.4.6
-Release:        5%{?dist}
+Release:        17%{?dist}
-
 Summary:        DeskTop Publishing application written in Qt
-
+# swatches bring in the fun licenses
-Group:          Applications/Productivity
+License:        GPLv2+ and OGL and CC0 and CC-BY and CC-BY-SA and Public Domain and ASL 2.0 and LGPLv2+ 
-License:        GPLv2+
 URL:            http://www.scribus.net/
 # ./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:  lcms2-devel
@@ -26,8 +29,8 @@ BuildRequires:  libpng-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  openssl-devel
-BuildRequires:  python-devel
+BuildRequires:  python2-devel
-BuildRequires:  python-imaging-devel
+BuildRequires:  python2-imaging-devel
 BuildRequires:  qt4-devel
 BuildRequires:  zlib-devel
 BuildRequires:  freetype-devel
@@ -38,9 +41,9 @@ BuildRequires:  boost-devel
 BuildRequires:  podofo-devel
 BuildRequires:  hyphen-devel
 Requires:       ghostscript
-Requires:       python
+Requires:       python2
-Requires:       python-imaging
+Requires:       python2-imaging
-Requires:       tkinter
+Requires:       python2-tkinter
 Requires:       shared-mime-info
 Obsoletes:      %{name}-doc < %{version}-%{release}
 Obsoletes:      %{name}-devel < %{version}-%{release}
@@ -64,6 +67,9 @@ import/export and creation of color separations.
 %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
@@ -98,7 +104,7 @@ 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 {} ';'
@@ -115,27 +121,48 @@ desktop-file-install \
 # remove unwanted stuff
 rm -rf ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}
 
-
+# Register as an application to be visible in the software center
-%post
+#
-touch --no-create %{_datadir}/mime/packages &> /dev/null || :
+# NOTE: It would be *awesome* if this file was maintained by the upstream
-
+# project, translated and installed into the right place during `make install`.
-%postun
+#
-if [ $1 -eq 0 ] ; then
+# See http://www.freedesktop.org/software/appstream/docs/ for more details.
-touch --no-create %{_datadir}/mime/packages &> /dev/null || :
+#
-update-desktop-database &> /dev/null || :
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
-update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
+cat > $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml <<EOF
-fi
+<?xml version="1.0" encoding="UTF-8"?>
-
+<!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
-%posttrans
+<!--
-update-desktop-database &> /dev/null || :
+BugReportURL: http://bugs.scribus.net/view.php?id=12708
-update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
+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
 %doc AUTHORS ChangeLog COPYING LINKS README
 %{_bindir}/%{name}
 %{_libdir}/%{name}/
+%{_datadir}/appdata/*%{name}.appdata.xml
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/mime/packages/%{name}.xml
 %{_datadir}/pixmaps/*
@@ -148,6 +175,93 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 
 %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)
 

sources

@@ -1 +1 @@
-1373e797409c1d6477a1f3cb9d061d0e  scribus-1.4.4-free.tar.xz
+106b2b55bfb87cab65d2d952dbaf7fea  scribus-1.4.6-free.tar.xz