- add workaround for #1085420

- remove non-free content from source archive (#887221)
- drop doc and devel sub-packages
- switch to lcms2

Conflicts:

	scribus.spec

.cvsignore

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

.gitignore

@@ -0,0 +1,8 @@
+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

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,40 @@
+#! /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 -O http://downloads.sourceforge.net/scribus/scribus-${version}.tar.xz
+
+echo "Extracting sources ..."
+rm -rf ${nv}
+xzcat $archive | tar xf -
+
+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/GiveLife_Color_System_*.xml
+rm resources/swatches/givelife_colors_license.rtf
+
+rm resources/swatches/Federal_Identity_Program.xml
+
+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.0-docdir.patch

@@ -0,0 +1,15 @@
+diff -up scribus-1.4.0/CMakeLists.txt.docdir scribus-1.4.0/CMakeLists.txt
+--- scribus-1.4.0/CMakeLists.txt.docdir	2012-01-02 15:06:44.000000000 +0100
++++ scribus-1.4.0/CMakeLists.txt	2012-01-02 15:06:57.000000000 +0100
+@@ -266,11 +266,7 @@ ELSE (WIN32 OR OS2)
+   IF(TAG_VERSION OR BUILD_OSX_BUNDLE)
+     SET(DOCDIR "share/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
+   ELSE(TAG_VERSION OR BUILD_OSX_BUNDLE)
+-        IF(NOT WANT_VERSIONING)
+-            SET(DOCDIR "share/doc/${MAIN_DIR_NAME}/")
+-        ELSE(NOT WANT_VERSIONING)
+             SET(DOCDIR "share/doc/${MAIN_DIR_NAME}-${VERSION}/")
+-        ENDIF(NOT WANT_VERSIONING)
+   ENDIF (TAG_VERSION OR BUILD_OSX_BUNDLE)
+ ENDIF (WIN32 OR OS2)
+ ADD_DEFINITIONS("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"")

scribus-1.4.2-nonfree.patch

@@ -0,0 +1,34 @@
+diff -up scribus-1.4.2/scribus/CMakeLists.txt.nonfree scribus-1.4.2/scribus/CMakeLists.txt
+--- scribus-1.4.2/scribus/CMakeLists.txt.nonfree	2012-06-07 22:01:10.000000000 +0200
++++ scribus-1.4.2/scribus/CMakeLists.txt	2013-01-15 18:50:11.000000000 +0100
+@@ -2,7 +2,6 @@ IF(WIN32)
+   ADD_DEFINITIONS(-DQT_DLL)
+ ENDIF(WIN32)
+ 
+-ADD_SUBDIRECTORY(doc)
+ ADD_SUBDIRECTORY(dtd)
+ ADD_SUBDIRECTORY(manpages)
+ ADD_SUBDIRECTORY(colormgmt)
+diff -up scribus-1.4.2/scribus/helpbrowser.cpp.nonfree scribus-1.4.2/scribus/helpbrowser.cpp
+--- scribus-1.4.2/scribus/helpbrowser.cpp.nonfree	2012-06-24 22:43:17.000000000 +0200
++++ scribus-1.4.2/scribus/helpbrowser.cpp	2013-01-15 18:50:11.000000000 +0100
+@@ -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);
+diff -up scribus-1.4.2/scribus/profiles/CMakeLists.txt.nonfree scribus-1.4.2/scribus/profiles/CMakeLists.txt
+--- scribus-1.4.2/scribus/profiles/CMakeLists.txt.nonfree	2012-01-03 22:47:01.000000000 +0100
++++ scribus-1.4.2/scribus/profiles/CMakeLists.txt	2013-01-15 18:50:11.000000000 +0100
+@@ -6,7 +6,5 @@ INSTALL(FILES
+ GenericCMYK.icm
+ GenericCMYK.txt
+ Readme
+-sRGB.icm
+-srgb.license
+   DESTINATION ${SHAREDIR}profiles
+ )

scribus.spec

@@ -1,21 +1,26 @@
 Name:           scribus
-Version:        1.3.5.1
-Release:        4%{?dist}
+Version:        1.4.3
+Release:        2%{?dist}
 
 Summary:        DeskTop Publishing application written in Qt
 
 Group:          Applications/Productivity
 License:        GPLv2+
 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
+# use versioned documentation directory
+Patch0:         %{name}-1.4.0-docdir.patch
+# fix build with non-free content removed
+Patch2:         %{name}-1.4.2-nonfree.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
@@ -24,12 +29,12 @@ BuildRequires:  libxml2-devel
 BuildRequires:  openssl-devel
 BuildRequires:  python-devel
 BuildRequires:  python-imaging-devel
-BuildRequires:  qt-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
@@ -38,7 +43,13 @@ Requires:       python
 Requires:       python-imaging
 Requires:       tkinter
 Requires:       shared-mime-info
-Requires:       %{name}-doc = %{version}-%{release}
+# workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1085420
+Requires:       lcms2
+Obsoletes:      %{name}-doc < %{version}-%{release}
+Obsoletes:      %{name}-devel < %{version}-%{release}
+
+%filter_provides_in %{_libdir}/%{name}/plugins
+%filter_setup
 
 
 %description
@@ -52,30 +63,10 @@ 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
+%patch0 -p1 -b .docdir
+%patch2 -p1 -b .nonfree
 
 # recode man page to UTF-8
 pushd scribus/manpages
@@ -99,15 +90,9 @@ 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
 
 
@@ -128,61 +113,104 @@ desktop-file-install --vendor="fedora"                      \
     --dir=${RPM_BUILD_ROOT}%{_datadir}/applications         \
     scribus.desktop
 
-
-%clean
-rm -rf ${RPM_BUILD_ROOT}
+# remove unwanted stuff
+rm -rf ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}
 
 
 %post
 update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
+update-desktop-database &> /dev/null || :
 
 
 %postun
 update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
+update-desktop-database &> /dev/null || :
 
 
 %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}
+%{_libdir}/%{name}/
 %{_datadir}/applications/fedora-%{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
+* Thu May 01 2014 Dan Horák <dan[at]danny.cz> - 1.4.3-2
+- add workaround for #1085420
+
+* Mon Aug 19 2013 Dan Horák <dan[at]danny.cz> - 1.4.3-1
+- update to 1.4.3 (#990030)
+
+* 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
+
+* 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-3
+- fix crash at export as image (rhbz#800765)
+
+* 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
+
+* 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
+
+* Mon Aug 16 2010 Dan Horák <dan[AT]danny.cz> - 1.3.8-1
+- update to 1.3.8
+
+* Sat Jun 19 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
+f63f615842f05fb36cd5401bcaa54386  scribus-1.4.3-free.tar.xz