fix typo

- fix docdir

.gitignore

@@ -1,3 +1,6 @@
 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.3.9-rpath.patch

@@ -1,25 +0,0 @@
-From a39803f21ffec3c94a0151bf5c17180e3fb54e65 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
-Date: Tue, 30 Nov 2010 11:53:22 +0100
-Subject: [PATCH] fix rpath injection
-
----
- .../plugins/tools/2geomtools/CMakeLists.txt        |    2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
-
-diff --git a/Scribus/scribus/plugins/tools/2geomtools/CMakeLists.txt b/Scribus/scribus/plugins/tools/2geomtools/CMakeLists.txt
-index a283288..59bc9c3 100644
---- a/Scribus/scribus/plugins/tools/2geomtools/CMakeLists.txt
-+++ b/Scribus/scribus/plugins/tools/2geomtools/CMakeLists.txt
-@@ -22,8 +22,6 @@ IF(Boost_FOUND)
-   MESSAGE(STATUS "Boost: FOUND, building 2geomtools")
-   INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIR} )
-   ADD_SUBDIRECTORY (lib2geom)
--  SET(GEOMLIB ${CMAKE_CURRENT_BINARY_DIR}/lib2geom/2geom)
--  LINK_DIRECTORIES(${PLUGIN_LIBRARIES} ${GEOMLIB})
-   ADD_SUBDIRECTORY (meshdistortion)
-   ADD_SUBDIRECTORY (pathalongpath)
- ELSE(Boost_FOUND)
--- 
-1.7.3.2
-

scribus-1.3.9-system-hyphen.patch

@@ -1,127 +0,0 @@
-From d3dfe80d0a9892236cbbe14b68fe301b93e90a6f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
-Date: Tue, 1 Jun 2010 10:54:50 +0200
-Subject: [PATCH] use system hyphen library
-
----
- Scribus/CMakeLists.txt                 |   10 ++++++++++
- Scribus/cmake/modules/FindHYPHEN.cmake |   28 ++++++++++++++++++++++++++++
- Scribus/scribus/CMakeLists.txt         |   16 ++++++++++++++--
- Scribus/scribus/hyphenator.h           |    2 +-
- 4 files changed, 53 insertions(+), 3 deletions(-)
- create mode 100644 Scribus/cmake/modules/FindHYPHEN.cmake
-
-diff --git a/Scribus/CMakeLists.txt b/Scribus/CMakeLists.txt
-index 6f37f5f..09396f3 100644
---- a/Scribus/CMakeLists.txt
-+++ b/Scribus/CMakeLists.txt
-@@ -678,6 +678,16 @@ IF (WITH_PODOFO)
- ENDIF (WITH_PODOFO)
- #>>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 --git a/Scribus/cmake/modules/FindHYPHEN.cmake b/Scribus/cmake/modules/FindHYPHEN.cmake
-new file mode 100644
-index 0000000..d67bd59
---- /dev/null
-+++ b/Scribus/cmake/modules/FindHYPHEN.cmake
-@@ -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)
-diff --git a/Scribus/scribus/CMakeLists.txt b/Scribus/scribus/CMakeLists.txt
-index 8663f39..5ab1762 100644
---- a/Scribus/scribus/CMakeLists.txt
-+++ b/Scribus/scribus/CMakeLists.txt
-@@ -397,10 +397,8 @@ SET(SCRIBUS_SOURCES
-   guidesdelegate.cpp
-   guidesmodel.cpp
-   helpbrowser.cpp
--  hnjalloc.c
-   hruler.cpp
-   hyask.cpp
--  hyphen.c
-   hyphenator.cpp
-   hysettings.cpp
-   imageinfodialog.cpp
-@@ -635,6 +633,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
-@@ -800,6 +806,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
-   ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY}
-diff --git a/Scribus/scribus/hyphenator.h b/Scribus/scribus/hyphenator.h
-index 7712c37..1312950 100644
---- a/Scribus/scribus/hyphenator.h
-+++ b/Scribus/scribus/hyphenator.h
-@@ -13,7 +13,7 @@ for which a new license (GPL+exception) is in place.
- #include <QSet>
- 
- #include "scribusapi.h"
--#include "hyphen.h"
-+#include <hyphen.h>
- class ScribusDoc;
- class ScribusMainWindow;
- class PageItem;
--- 
-1.7.3.2
-

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.spec

@@ -1,19 +1,16 @@
 Name:           scribus
-Version:        1.3.9
-Release:        3%{?dist}
+Version:        1.4.1
+Release:        1%{?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
-# https://bugzilla.redhat.com/show_bug.cgi?id=506074
-# http://bugs.scribus.net/view.php?id=8232
-Patch0:         %{name}-1.3.9-system-hyphen.patch
-# fix rpath injection
-Patch1:         %{name}-1.3.9-rpath.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+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
 
 BuildRequires:  cmake
 
@@ -28,7 +25,7 @@ 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
@@ -82,9 +79,8 @@ Obsoletes:      %{name}-doc < 1.3.5-0.12.beta
 %{summary}
 
 %prep
-%setup -q -n %{name}-%{version}
-%patch0 -p2 -b .system-hyphen
-%patch1 -p2 -b .rpath
+%setup -q -n Scribus
+%patch0 -p1 -b .docdir
 
 # recode man page to UTF-8
 pushd scribus/manpages
@@ -132,10 +128,6 @@ desktop-file-install --vendor="fedora"                      \
     scribus.desktop
 
 
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
-
 %post
 update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
 update-desktop-database &> /dev/null || :
@@ -147,19 +139,18 @@ 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 %{_defaultdocdir}/%{name}-%{version}/AUTHORS
+%doc %{_defaultdocdir}/%{name}-%{version}/ChangeLog
+%doc %{_defaultdocdir}/%{name}-%{version}/ChangeLogSVN
+%doc %{_defaultdocdir}/%{name}-%{version}/COPYING
+%doc %{_defaultdocdir}/%{name}-%{version}/README
+%doc %{_defaultdocdir}/%{name}-%{version}/TODO
 %{_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/*
@@ -167,23 +158,39 @@ update-desktop-database &> /dev/null || :
 %{_mandir}/de/man1/*
 
 %files devel
-%defattr(-,root,root,-)
 %doc AUTHORS COPYING
-%{_includedir}/%{name}
+%{_includedir}/%{name}/
 
 %files doc
-%defattr(-,root,root,-)
-%dir %{_datadir}/doc/%{name}-%{version}
-%lang(en) %{_datadir}/doc/%{name}-%{version}/en
-%{_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
+%dir %{_defaultdocdir}/%{name}-%{version}
+%lang(de) %{_defaultdocdir}/%{name}-%{version}/de
+%lang(en) %{_defaultdocdir}/%{name}-%{version}/en
+%lang(it) %{_defaultdocdir}/%{name}-%{version}/it
+%{_defaultdocdir}/%{name}-%{version}/BUILDING
+%{_defaultdocdir}/%{name}-%{version}/NEWS
+%{_defaultdocdir}/%{name}-%{version}/README*
+%{_defaultdocdir}/%{name}-%{version}/PACKAGING
+%{_defaultdocdir}/%{name}-%{version}/LINKS
+%{_defaultdocdir}/%{name}-%{version}/TRANSLATION
 
 
 %changelog
+* 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
+
 * 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
 

sources

@@ -1 +1,2 @@
-a54dbf2e10cd88d683d0d34565d29378  scribus-1.3.9.tar.bz2
+c79593dc61bc137d9e7968b37d070993  scribus-1.4.1.tar.xz
+af78a7dbbadbda553051e51d8eb090ae  scribus-1.4.1.tar.xz.asc