- update to 1.3.5-rc3

- use system hyphen library (#506074) - fix update path for the doc subpackage (#512498) - preserve directories when installing headers (#511800)
2009-07-21 18:53:02 +00:00 · 2009-07-21 18:53:02 +00:00 · e8b8d62537
parent 1e84dbcc87
commit e8b8d62537
5 changed files with 161 additions and 30 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -1 +1 @@
-scribus-1.3.5.rc2.tar.bz2
+scribus-1.3.5.rc3.tar.bz2
--- a/scribus-1.3.5-install-headers.patch
+++ b/scribus-1.3.5-install-headers.patch
@ -0,0 +1,12 @@
+--- scribus-1.3.5.rc3/scribus/CMakeLists.txt.orig	2009-05-17 23:23:08.000000000 +0200
+++ scribus-1.3.5.rc3/scribus/CMakeLists.txt	2009-07-21 15:09:25.000000000 +0200
+@@ -834,8 +834,7 @@ ENDIF(APPLEBUNDLE)
+ 
+ #Install our header files, selected from all existing dirs
+ IF(NOT WANT_NOHEADERINSTALL)
+-  FILE( GLOB_RECURSE SCRIBUS_HEADER_FILES *.h )
+-  INSTALL(FILES ${SCRIBUS_HEADER_FILES} DESTINATION ${INCLUDEDIR})
+  INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ DESTINATION ${INCLUDEDIR} FILES_MATCHING PATTERN "*.h")
+ ELSE(NOT WANT_NOHEADERINSTALL)
+   MESSAGE(STATUS "No source header files will be installed")
+ ENDIF(NOT WANT_NOHEADERINSTALL)
--- a/scribus-1.3.5-system-hyphen.patch
+++ b/scribus-1.3.5-system-hyphen.patch
@ -0,0 +1,105 @@
+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;
--- a/scribus.spec
+++ b/scribus.spec
@ -1,13 +1,15 @@
 Name:           scribus
 Version:        1.3.5
-Release:        0.14.rc2%{?dist}
+Release:        0.15.rc3%{?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}.rc2.tar.bz2
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.rc3.tar.bz2
+Patch0:         %{name}-1.3.5-system-hyphen.patch
+Patch1:         %{name}-1.3.5-install-headers.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

 BuildRequires:  cmake
@ -31,6 +33,7 @@ BuildRequires:  cairo-devel
 BuildRequires:  aspell-devel
 BuildRequires:  boost-devel
 BuildRequires:  podofo-devel
+BuildRequires:  hyphen-devel
 Requires:       ghostscript >= 7.07
 Requires:       python >= 2.3
 Requires:       python-imaging
@ -63,6 +66,7 @@ Group:          Development/Tools
 Requires:       %{name} = %{version}-%{release}
 %if 0%{?fedora} > 9
 BuildArch:      noarch
+Obsoletes:      %{name}-doc < 1.3.5-0.12.beta
 %endif


@ -70,7 +74,9 @@ BuildArch:      noarch
 %{summary}

 %prep
-%setup -q -n %{name}-%{version}.rc2
+%setup -q -n %{name}-%{version}.rc3
+%patch0 -p1 -b .system-hyphen
+%patch1 -p1 -b .install-headers

 # recode man page to UTF-8
 pushd scribus/manpages
@ -86,8 +92,8 @@ chmod a-x scribus/pageitem_latexframe.h
 %build
 mkdir build
 pushd build
-%cmake -DOPENSYNC_LIBEXEC_DIR=%{_libexecdir} \
-    -DCMAKE_SKIP_RPATH=YES  ../
+%cmake -DOPENSYNC_LIBEXEC_DIR=%{_libexecdir} ..
+
 make VERBOSE=1 %{?_smp_mflags}
 popd

@ -103,6 +109,9 @@ install -p -D -m0644 ${RPM_BUILD_ROOT}%{_datadir}/scribus/icons/scribusdoc.png $

 find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'

+# remove empty dirs in %{_includedir}
+rm -rf ${RPM_BUILD_ROOT}%{_includedir}/%{name}/{dicts,doc,dtd,editorconfig,icons,keysets,loremipsum,manpages,profiles,swatches,templates,unicodemap}
+
 # install the global desktop file
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/mimelnk/application/*scribus.desktop
 desktop-file-install --vendor="fedora"                      \
@ -125,12 +134,12 @@ update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog ChangeLogSVN COPYING README TODO
-%{_bindir}/scribus
+%{_bindir}/%{name}
 %{_datadir}/applications/fedora-scribus.desktop
 %{_datadir}/mime/packages/scribus.xml
 %{_datadir}/pixmaps/*
-%{_datadir}/scribus/
-%{_libdir}/scribus/
+%{_datadir}/%{name}
+%{_libdir}/%{name}
 %{_mandir}/man1/*
 %{_mandir}/pl/man1/*
 %{_mandir}/de/man1/*
@ -138,33 +147,38 @@ update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
 %files devel
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
-%{_includedir}/scribus/
+%{_includedir}/%{name}

 %files doc
 %defattr(-,root,root,-)
-%dir %{_datadir}/doc/%{name}-1.3.5.rc2
-%lang(cd) %{_datadir}/doc/%{name}-1.3.5.rc2/cs
-%lang(de) %{_datadir}/doc/%{name}-1.3.5.rc2/de
-%lang(en) %{_datadir}/doc/%{name}-1.3.5.rc2/en
-%lang(fr) %{_datadir}/doc/%{name}-1.3.5.rc2/fr
-%lang(pl) %{_datadir}/doc/%{name}-1.3.5.rc2/pl
-%{_datadir}/doc/%{name}-1.3.5.rc2/AUTHORS
-%{_datadir}/doc/%{name}-1.3.5.rc2/BUILDING
-%{_datadir}/doc/%{name}-1.3.5.rc2/ChangeLog
-%{_datadir}/doc/%{name}-1.3.5.rc2/ChangeLogSVN
-%{_datadir}/doc/%{name}-1.3.5.rc2/COPYING
-%{_datadir}/doc/%{name}-1.3.5.rc2/NEWS
-%{_datadir}/doc/%{name}-1.3.5.rc2/README*
-%{_datadir}/doc/%{name}-1.3.5.rc2/TODO
-%{_datadir}/doc/%{name}-1.3.5.rc2/PACKAGING
-%{_datadir}/doc/%{name}-1.3.5.rc2/LINKS
-%{_datadir}/doc/%{name}-1.3.5.rc2/TRANSLATION
+%dir %{_datadir}/doc/%{name}-1.3.5.rc3
+%lang(cd) %{_datadir}/doc/%{name}-1.3.5.rc3/cs
+%lang(de) %{_datadir}/doc/%{name}-1.3.5.rc3/de
+%lang(en) %{_datadir}/doc/%{name}-1.3.5.rc3/en
+%lang(fr) %{_datadir}/doc/%{name}-1.3.5.rc3/fr
+%lang(pl) %{_datadir}/doc/%{name}-1.3.5.rc3/pl
+%{_datadir}/doc/%{name}-1.3.5.rc3/AUTHORS
+%{_datadir}/doc/%{name}-1.3.5.rc3/BUILDING
+%{_datadir}/doc/%{name}-1.3.5.rc3/ChangeLog
+%{_datadir}/doc/%{name}-1.3.5.rc3/ChangeLogSVN
+%{_datadir}/doc/%{name}-1.3.5.rc3/COPYING
+%{_datadir}/doc/%{name}-1.3.5.rc3/NEWS
+%{_datadir}/doc/%{name}-1.3.5.rc3/README*
+%{_datadir}/doc/%{name}-1.3.5.rc3/TODO
+%{_datadir}/doc/%{name}-1.3.5.rc3/PACKAGING
+%{_datadir}/doc/%{name}-1.3.5.rc3/LINKS
+%{_datadir}/doc/%{name}-1.3.5.rc3/TRANSLATION

- 

 %changelog
+* Tue Jul 21 2009 Dan Horák <dan[AT]danny.cz> - 1.3.5-0.15.rc3
+- update to 1.3.5-rc3
+- use system hyphen library (#506074)
+- fix update path for the doc subpackage (#512498)
+- preserve directories when installing headers (#511800)
+
 * Thu Jun  4 2009 Dan Horák <dan[AT]danny.cz> - 1.3.5-0.14.rc2
- update to 1.3.5.beta
+- update to 1.3.5-rc2

 * Mon May 18 2009 Dan Horák <dan[AT]danny.cz> - 1.3.5-0.13.beta
 - rebuilt with podofo enabled
--- a/2
+++ b/2
@ -1 +1 @@
-161eaae7a97bd9f2824a677e771bd36f  scribus-1.3.5.rc2.tar.bz2
+4c030bbec4405743fd2d3f842622351c  scribus-1.3.5.rc3.tar.bz2