SHA256
1
0
forked from pool/scribus

Update to 1.5.4 development candidate

OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/scribus?expand=0&rev=43
This commit is contained in:
Christophe Giboudeaux 2019-04-07 13:04:12 +00:00 committed by Git OBS Bridge
parent 8be81f862e
commit 780843f201
11 changed files with 112 additions and 191 deletions

View File

@ -1,20 +0,0 @@
From: Wolfgang Bauer <wbauer@tmo.at>
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 <fabian@ritter-vogt.de>
---
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

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:42d335b4a59c26c8ae1e3f601676baa3c42b035b8cde326d195f7a30078e5fec
size 72763748

3
scribus-1.5.4.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6480925250b2bb07028e2f378c02b67fe3e33206743671e03c07c701cd05da03
size 72832248

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b2dd2ae425f33a6b5d5e50452b7167764f324e5b2bc84133de81a7985b20d936
size 14880

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1e39960309f4d5c8d98b82a4fb9ce9e610967e3f489a8ab983bdfcdc437326a4
size 1573

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9ee630588a22f26e5653e96eddde1916842ba7df324423b849ab0a0ca23f6068
size 42627

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f14d678e29ab2ccc143adb09a4ae7de30d72f23ce046231614a2945454746068
size 2268

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:adb445babf7b4c42be3142c0bbfadcb6febbded47f9b789bbcb33986fc9240d5
size 5776

View File

@ -1,35 +0,0 @@
<?xml version='1.0' encoding='UTF-8'?>
<component>
<id type="desktop">scribus.desktop</id>
<metadata_license>CC0-1.0</metadata_license>
<name>Scribus</name>
<project_license>GPL-2.0+</project_license>
<summary>Open Source Page Layout and Desktop Publishing (DTP)</summary>
<url type="homepage">http://www.scribus.net/</url>
<description>
<p>Scribus is a open source page layout program which
produces commercial grade output in PDF and Postscript, primarily,
though not exclusively, for Linux.</p>
<p>
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.</p>
</description>
<screenshots>
<screenshot type="default">
<image height="708" width="1000">https://raw.githubusercontent.com/scribusproject/scribus/master/doc/en/images/Rembrandt2.png</image>
<caption>Main Window with blank page</caption>
</screenshot>
<screenshot>
<image height="702" width="1000">https://raw.githubusercontent.com/scribusproject/scribus/master/doc/en/images/Rembrandt18.png</image>
<caption>Properties window</caption>
</screenshot>
<screenshot>
<image height="477" width="629">https://raw.githubusercontent.com/scribusproject/scribus/master/doc/en/images/Rembrandt16.png</image>
<caption>Image effects tab</caption>
</screenshot>
</screenshots>
<update_contact>scribus-dev@lists.scribus.net</update_contact>
</component>

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Sun Apr 7 12:54:03 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>
- Update to 1.5.5 (development candidate)
* 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 <fabian@ritter-vogt.de> Sat Nov 24 16:26:56 UTC 2018 - Fabian Vogt <fabian@ritter-vogt.de>

View File

@ -1,7 +1,7 @@
# #
# spec file for package scribus # spec file for package scribus
# #
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) Peter Linnell and 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) Peter Linnell and 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
@ -18,53 +18,65 @@
Name: scribus Name: scribus
Version: 1.4.7 Version: 1.5.4
Release: 0 Release: 0
Summary: Page Layout and Desktop Publishing (DTP) Summary: Page Layout and Desktop Publishing (DTP)
License: GPL-2.0-or-later License: GPL-2.0-or-later
Group: Productivity/Publishing/Other Group: Productivity/Publishing/Other
Url: http://www.scribus.net/ URL: https://www.scribus.net/
Source0: http://sourceforge.net/projects/%{name}/files/%{name}/%{version}/%{name}-%{version}.tar.xz # replace scribus-devel with scribus when it will be released
Source1: %{name}-icon24.png Source: https://sourceforge.net/projects/scribus/files/scribus-devel/%{version}/%{name}-%{version}.tar.xz
Source2: %{name}-icon32.png BuildRequires: breeze5-icons
Source3: %{name}-icon64.png BuildRequires: cmake
Source4: %{name}-icon128.png BuildRequires: cups-devel
Source5: %{name}-icon256.png BuildRequires: fdupes
Source6: %{name}.appdata.xml BuildRequires: libcdr-devel
# PATCH-FIX-OPENSUSE BuildRequires: libetonyek-devel
Patch: hunspell.patch BuildRequires: libfreehand-devel
BuildRequires: libmspub-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build 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}
%if 0%{?suse_version} > 1325 %if 0%{?suse_version} > 1325
BuildRequires: libboost_headers-devel BuildRequires: libboost_headers-devel
%else %else
BuildRequires: boost-devel BuildRequires: boost-devel
%endif %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 %description
Scribus is a page layout program which produces output in PDF and Scribus is a page layout program which produces output in PDF and
@ -74,104 +86,73 @@ Scribus supports publishing features such as CMYK and spot colors,
PDF creation, Encapsulated Postscript import and export and creation PDF creation, Encapsulated Postscript import and export and creation
of color separations. of color separations.
%package devel %package doc
Summary: Development files for Scribus Summary: Documentation for Scribus
Group: Development/Libraries/Other Group: Documentation/HTML
Requires: %{name} = %{version} Requires: %{name}
Requires: freetype2-devel
Requires: glibc-devel
Requires: libstdc++-devel
Requires: zlib-devel
%description devel %description doc
This package provides the development headers for Scribus, used for This package provides the documentation for Scribus.
developing Scribus plugins.
%prep %prep
%setup -q %setup -q
%patch -p1
%build %build
# Delete non-free colour swatches (bnc#763586) %cmake -DWANT_DISTROBUILD=1 \
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
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 \ -DWANT_HUNSPELL=1 \
../ -DWANT_GRAPHICSMAGICK=1 \
%if "%{_lib}" == "lib64"
make %{_smp_mflags} -DWANT_LIB64=1
%install
pushd build
%make_install
popd
# 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
%if 0%{?suse_version}
%suse_update_desktop_file -r -i %{name} Qt Office Publishing WordProcessor
%endif %endif
%fdupes %{buildroot}/%{_prefix} # Still not available on all leap flavors
# %%cmake_build
%make_jobs
# INSTALL APPSTREAM METAINFO (SOURCE6) %install
install -Dm0644 %{S:6} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %cmake_install
#update the mime database # Remove duplicate files
for docfile in {COPYING,AUTHORS,ChangeLog,README,LINKS,TRANSLATION}; do
rm -f %{buildroot}%{_datadir}/doc/scribus/$docfile
done
%fdupes -s %{buildroot}%{_datadir}/doc/scribus
mkdir -p %{buildroot}%{_datadir}/pixmaps
cp %{_datadir}/icons/breeze/apps/48/scribus.svg %{buildroot}%{_datadir}/pixmaps/
%suse_update_desktop_file -r scribus Qt Office WordProcessor
# Update the mime database
%post %post
%mime_database_post %mime_database_post
%desktop_database_post
%icon_theme_cache_post
%postun %postun
%mime_database_postun %mime_database_postun
%desktop_database_postun
%icon_theme_cache_postun %files doc
%license COPYING
%{_datadir}/doc/scribus/
%files %files
%defattr(-,root,root) %license COPYING
%{_bindir}/scribus %doc AUTHORS README ChangeLog LINKS TRANSLATION
%{_mandir}/man?/*.* %dir %{_datadir}/icons/hicolor/1024x1024
%{_mandir}/*/man?/*.* %dir %{_datadir}/icons/hicolor/1024x1024/apps
%{_libdir}/scribus %lang(de) %dir %{_mandir}/de
%{_datadir}/mime/packages/scribus.xml %lang(de) %dir %{_mandir}/de/man1
%{_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) %dir %{_mandir}/pl
%lang(pl) %{_mandir}/pl/man1 %lang(pl) %dir %{_mandir}/pl/man1
%{_datadir}/icons/hicolor/*/apps/%{name}.png %{_bindir}/scribus
%dir %{_datadir}/appdata %{_datadir}/applications/scribus.desktop
%{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/icons/hicolor/*/apps/scribus.png
%{_datadir}/metainfo/scribus.appdata.xml
%files devel %{_datadir}/mime/packages/scribus.xml
%defattr(-,root,root) %{_datadir}/pixmaps/scribus.svg
%{_includedir}/scribus %{_datadir}/scribus/
%{_libdir}/scribus/
%{_mandir}/*/man?/*.*
%{_mandir}/man?/*.*
%changelog %changelog