From eedeb389015c52d716fed9cb57d58bf1a73a69b8fbae8c89da86d66e212d94e6 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Mon, 8 Apr 2019 09:50:52 +0000 Subject: [PATCH] revert to 1.4.7 for the moment. OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/scribus?expand=0&rev=45 --- hunspell.patch | 20 ++++ scribus-1.4.7.tar.xz | 3 + scribus-1.5.5-svn22930.tar.xz | 3 - scribus-icon128.png | 3 + scribus-icon24.png | 3 + scribus-icon256.png | 3 + scribus-icon32.png | 3 + scribus-icon64.png | 3 + scribus.appdata.xml | 35 ++++++ scribus.changes | 10 -- scribus.spec | 211 ++++++++++++++++++---------------- 11 files changed, 188 insertions(+), 109 deletions(-) create mode 100644 hunspell.patch create mode 100644 scribus-1.4.7.tar.xz delete mode 100644 scribus-1.5.5-svn22930.tar.xz create mode 100644 scribus-icon128.png create mode 100644 scribus-icon24.png create mode 100644 scribus-icon256.png create mode 100644 scribus-icon32.png create mode 100644 scribus-icon64.png create mode 100644 scribus.appdata.xml diff --git a/hunspell.patch b/hunspell.patch new file mode 100644 index 0000000..4b8ef39 --- /dev/null +++ b/hunspell.patch @@ -0,0 +1,20 @@ +From: Wolfgang Bauer +Subject: Try to build against any hunspell version + +Necessary to have spellchecking support in Tumbleweed and Leap 15.0, which +have hunspell 1.6.2 that wasn't found and spellchecking got disabled... + +Edited-by: Fabian Vogt +--- +diff -Nru a/cmake/modules/FindHUNSPELL.cmake b/cmake/modules/FindHUNSPELL.cmake +--- a/cmake/modules/FindHUNSPELL.cmake 2012-04-10 22:17:07.000000000 +0200 ++++ b/cmake/modules/FindHUNSPELL.cmake 2016-04-26 13:59:20.473641707 +0200 +@@ -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.4 hunspell-1.3 hunspell-1.2 PATHS /opt/local/lib /usr/local/lib /usr/lib ) ++FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell PATHS /opt/local/lib /usr/local/lib /usr/lib ) + + INCLUDE(FindPackageHandleStandardArgs) + # handle the QUIETLY and REQUIRED arguments and set HUNSPELL_FOUND to TRUE diff --git a/scribus-1.4.7.tar.xz b/scribus-1.4.7.tar.xz new file mode 100644 index 0000000..51218da --- /dev/null +++ b/scribus-1.4.7.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:42d335b4a59c26c8ae1e3f601676baa3c42b035b8cde326d195f7a30078e5fec +size 72763748 diff --git a/scribus-1.5.5-svn22930.tar.xz b/scribus-1.5.5-svn22930.tar.xz deleted file mode 100644 index 81cbff4..0000000 --- a/scribus-1.5.5-svn22930.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6df6ef37bd67e4caaeb5dfa2715ee64b1355c2affdf58d2152ed9ecff76f3b1c -size 74060648 diff --git a/scribus-icon128.png b/scribus-icon128.png new file mode 100644 index 0000000..03d0205 --- /dev/null +++ b/scribus-icon128.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b2dd2ae425f33a6b5d5e50452b7167764f324e5b2bc84133de81a7985b20d936 +size 14880 diff --git a/scribus-icon24.png b/scribus-icon24.png new file mode 100644 index 0000000..a3df159 --- /dev/null +++ b/scribus-icon24.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1e39960309f4d5c8d98b82a4fb9ce9e610967e3f489a8ab983bdfcdc437326a4 +size 1573 diff --git a/scribus-icon256.png b/scribus-icon256.png new file mode 100644 index 0000000..ac79965 --- /dev/null +++ b/scribus-icon256.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9ee630588a22f26e5653e96eddde1916842ba7df324423b849ab0a0ca23f6068 +size 42627 diff --git a/scribus-icon32.png b/scribus-icon32.png new file mode 100644 index 0000000..21de57c --- /dev/null +++ b/scribus-icon32.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f14d678e29ab2ccc143adb09a4ae7de30d72f23ce046231614a2945454746068 +size 2268 diff --git a/scribus-icon64.png b/scribus-icon64.png new file mode 100644 index 0000000..d1b1c2e --- /dev/null +++ b/scribus-icon64.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:adb445babf7b4c42be3142c0bbfadcb6febbded47f9b789bbcb33986fc9240d5 +size 5776 diff --git a/scribus.appdata.xml b/scribus.appdata.xml new file mode 100644 index 0000000..5269503 --- /dev/null +++ b/scribus.appdata.xml @@ -0,0 +1,35 @@ + + + scribus.desktop + CC0-1.0 + Scribus + GPL-2.0+ + Open Source Page Layout and Desktop Publishing (DTP) + http://www.scribus.net/ + +

Scribus is a open source page layout program which +produces commercial grade output in PDF and Postscript, primarily, +though not exclusively, for Linux.

+

+While the goals of the program are ease of use and simple +easy-to-understand tools, Scribus support for professional +publishing features, such as CMYK and spot colors, easy PDF creation, +Encapsulated Postscript import and export and creation of color +separations.

+ + + + https://raw.githubusercontent.com/scribusproject/scribus/master/doc/en/images/Rembrandt2.png + Main Window with blank page + + + https://raw.githubusercontent.com/scribusproject/scribus/master/doc/en/images/Rembrandt18.png + Properties window + + + https://raw.githubusercontent.com/scribusproject/scribus/master/doc/en/images/Rembrandt16.png + Image effects tab + + + scribus-dev@lists.scribus.net + diff --git a/scribus.changes b/scribus.changes index caf2d77..e6eac70 100644 --- a/scribus.changes +++ b/scribus.changes @@ -1,13 +1,3 @@ -------------------------------------------------------------------- -Sun Apr 7 12:54:03 UTC 2019 - Christophe Giboudeaux - -- Update to 1.5.5 (SVN rev. 22930) - * Scribus now uses Qt5 - * Too many changes to list here, check the ChangeLog file. -- Move the documentation to its own package -- Drop the -devel package -- Drop hunspell.patch - ------------------------------------------------------------------- Sat Nov 24 16:26:56 UTC 2018 - Fabian Vogt diff --git a/scribus.spec b/scribus.spec index 7ee20b3..81e8c6a 100644 --- a/scribus.spec +++ b/scribus.spec @@ -18,65 +18,53 @@ Name: scribus -Version: 1.5.4 +Version: 1.4.7 Release: 0 Summary: Page Layout and Desktop Publishing (DTP) License: GPL-2.0-or-later Group: Productivity/Publishing/Other -URL: https://www.scribus.net/ -# Source: https://sourceforge.net/projects/scribus/files/scribus-devel/%{version}/%{name}-%{version}.tar.xz -Source: scribus-1.5.5-svn22930.tar.xz -BuildRequires: breeze5-icons -BuildRequires: cmake -BuildRequires: cups-devel -BuildRequires: fdupes -BuildRequires: libcdr-devel -BuildRequires: libetonyek-devel -BuildRequires: libfreehand-devel -BuildRequires: libmspub-devel -BuildRequires: libpagemaker-devel -BuildRequires: libpodofo-devel -BuildRequires: libqxp-devel -BuildRequires: librevenge-devel -BuildRequires: libtiff-devel -BuildRequires: libvisio-devel -BuildRequires: libwpd-devel -BuildRequires: libwpg-devel -BuildRequires: libzmf-devel -BuildRequires: pkgconfig -BuildRequires: python-devel -BuildRequires: update-desktop-files -BuildRequires: cmake(Qt5Core) >= 5.7.0 -BuildRequires: cmake(Qt5Gui) >= 5.7.0 -BuildRequires: cmake(Qt5LinguistTools) >= 5.7.0 -BuildRequires: cmake(Qt5Network) >= 5.7.0 -BuildRequires: cmake(Qt5OpenGL) >= 5.7.0 -BuildRequires: cmake(Qt5PrintSupport) >= 5.7.0 -BuildRequires: cmake(Qt5Widgets) >= 5.7.0 -BuildRequires: cmake(Qt5Xml) >= 5.7.0 -BuildRequires: pkgconfig(GraphicsMagick) -BuildRequires: pkgconfig(GraphicsMagick++) -BuildRequires: pkgconfig(cairo) -BuildRequires: pkgconfig(fontconfig) -BuildRequires: pkgconfig(freetype2) -BuildRequires: pkgconfig(harfbuzz) -BuildRequires: pkgconfig(hunspell) -BuildRequires: pkgconfig(icu-i18n) -BuildRequires: pkgconfig(icu-uc) -BuildRequires: pkgconfig(lcms2) -BuildRequires: pkgconfig(libjpeg) -BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(openssl) -BuildRequires: pkgconfig(poppler) -BuildRequires: pkgconfig(zlib) -Recommends: scribus-doc -Provides: scribus-devel = %{version} -Obsoletes: scribus-devel < %{version} +Url: http://www.scribus.net/ +Source0: http://sourceforge.net/projects/%{name}/files/%{name}/%{version}/%{name}-%{version}.tar.xz +Source1: %{name}-icon24.png +Source2: %{name}-icon32.png +Source3: %{name}-icon64.png +Source4: %{name}-icon128.png +Source5: %{name}-icon256.png +Source6: %{name}.appdata.xml +# PATCH-FIX-OPENSUSE +Patch: hunspell.patch + +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1325 BuildRequires: libboost_headers-devel %else BuildRequires: boost-devel %endif +BuildRequires: cairo-devel +BuildRequires: cmake >= 2.6.0 +BuildRequires: cups-devel +BuildRequires: fdupes +BuildRequires: fontconfig-devel +BuildRequires: hicolor-icon-theme +BuildRequires: hunspell-devel +BuildRequires: liblcms2-devel +BuildRequires: libpodofo-devel +BuildRequires: libqt4-devel >= 4.6.0 +BuildRequires: libtiff-devel +BuildRequires: libxml2-devel +BuildRequires: openssl-devel +BuildRequires: pkgconfig +BuildRequires: python-devel +BuildRequires: shared-mime-info +BuildRequires: update-desktop-files + +%if 0%{?suse_version} +Requires: ghostscript-library +Requires: python-imaging +Requires: tk +Suggests: AdobeICCProfiles +Suggests: Uniconvertor +%endif %description Scribus is a page layout program which produces output in PDF and @@ -86,73 +74,104 @@ Scribus supports publishing features such as CMYK and spot colors, PDF creation, Encapsulated Postscript import and export and creation of color separations. -%package doc -Summary: Documentation for Scribus -Group: Documentation/HTML -Requires: %{name} +%package devel +Summary: Development files for Scribus +Group: Development/Libraries/Other +Requires: %{name} = %{version} +Requires: freetype2-devel +Requires: glibc-devel +Requires: libstdc++-devel +Requires: zlib-devel -%description doc -This package provides the documentation for Scribus. +%description devel +This package provides the development headers for Scribus, used for +developing Scribus plugins. %prep -%setup -q -n scribus + +%setup -q +%patch -p1 %build -%cmake -DWANT_DISTROBUILD=1 \ - -DWANT_HUNSPELL=1 \ - -DWANT_GRAPHICSMAGICK=1 \ -%if "%{_lib}" == "lib64" - -DWANT_LIB64=1 -%endif +# Delete non-free colour swatches (bnc#763586) +rm resources/swatches/givelife_colors_license.rtf +rm resources/swatches/GiveLife_Color_System*.xml +# All .eps swatches come with the same non-free license by dtp studio Oldenburg. +rm resources/swatches/*.eps +rm resources/swatches/dtp-studio-free-palettes-license.rtf -# Still not available on all leap flavors -# %%cmake_build -%make_jobs +export CXXFLAGS="%{optflags} -fno-strict-aliasing" +export CFLAGS="$CXXFLAGS" + +mkdir build +pushd build +cmake \ + -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + %if "%{_lib}" == "lib64" + -DWANT_LIB64=1 \ + %endif + -DWANT_CAIRO=1 \ + -DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE \ + -DCMAKE_SKIP_RPATH=TRUE \ + -DWANT_HUNSPELL=1 \ + ../ + +make %{_smp_mflags} %install -%cmake_install -# Remove duplicate files -for docfile in {COPYING,AUTHORS,ChangeLog,README,LINKS,TRANSLATION}; do - rm -f %{buildroot}%{_datadir}/doc/scribus/$docfile -done +pushd build +%make_install +popd -%fdupes -s %{buildroot}%{_datadir}/doc/scribus +# install hi-res icons for better appearance on gnome-shell +install -D -m 0644 %{S:1} %{buildroot}%{_datadir}/icons/hicolor/24x24/apps/%{name}.png +install -D -m 0644 %{S:2} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png +install -D -m 0644 %{S:3} %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/%{name}.png +install -D -m 0644 %{S:4} %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/%{name}.png +install -D -m 0644 %{S:5} %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/%{name}.png -mkdir -p %{buildroot}%{_datadir}/pixmaps -cp %{_datadir}/icons/breeze/apps/48/scribus.svg %{buildroot}%{_datadir}/pixmaps/ +%if 0%{?suse_version} +%suse_update_desktop_file -r -i %{name} Qt Office Publishing WordProcessor -%suse_update_desktop_file -r scribus Qt Office WordProcessor +%endif + +%fdupes %{buildroot}/%{_prefix} + +# INSTALL APPSTREAM METAINFO (SOURCE6) +install -Dm0644 %{S:6} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml + +#update the mime database -# Update the mime database %post %mime_database_post +%desktop_database_post +%icon_theme_cache_post %postun %mime_database_postun - -%files doc -%license COPYING -%{_datadir}/doc/scribus/ +%desktop_database_postun +%icon_theme_cache_postun %files -%license COPYING -%doc AUTHORS README ChangeLog LINKS TRANSLATION -%dir %{_datadir}/icons/hicolor/1024x1024 -%dir %{_datadir}/icons/hicolor/1024x1024/apps -%lang(de) %dir %{_mandir}/de -%lang(de) %dir %{_mandir}/de/man1 -%lang(pl) %dir %{_mandir}/pl -%lang(pl) %dir %{_mandir}/pl/man1 +%defattr(-,root,root) %{_bindir}/scribus -%{_datadir}/applications/scribus.desktop -%{_datadir}/icons/hicolor/*/apps/scribus.png -%{_datadir}/metainfo/scribus.appdata.xml -%{_datadir}/mime/packages/scribus.xml -%{_datadir}/pixmaps/scribus.svg -%{_datadir}/scribus/ -%{_libdir}/scribus/ -%{_mandir}/*/man?/*.* %{_mandir}/man?/*.* +%{_mandir}/*/man?/*.* +%{_libdir}/scribus +%{_datadir}/mime/packages/scribus.xml +%{_datadir}/scribus +%{_datadir}/doc/scribus +%{_datadir}/applications/%{name}.desktop +# This should be owned by filesystem or man, but there are only scribus files: +%lang(pl) %dir %{_mandir}/pl +%lang(pl) %{_mandir}/pl/man1 +%{_datadir}/icons/hicolor/*/apps/%{name}.png +%dir %{_datadir}/appdata +%{_datadir}/appdata/%{name}.appdata.xml + +%files devel +%defattr(-,root,root) +%{_includedir}/scribus %changelog