Hello community, here is the log from the commit of package scribus for openSUSE:Factory checked in at 2019-09-09 23:56:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scribus (Old) and /work/SRC/openSUSE:Factory/.scribus.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scribus" Mon Sep 9 23:56:05 2019 rev:65 rq:729432 version:1.5.5 Changes: -------- --- /work/SRC/openSUSE:Factory/scribus/scribus.changes 2018-11-26 10:33:06.212831308 +0100 +++ /work/SRC/openSUSE:Factory/.scribus.new.7948/scribus.changes 2019-09-09 23:56:11.973236907 +0200 @@ -1,0 +2,11 @@ +Fri Aug 9 20:36:41 UTC 2019 - Christophe Giboudeaux <[email protected]> + +- Update to 1.5.5: + * Development version using Qt5. + * Large code refactoring + * Many bugs fixed +- Check https://wiki.scribus.net/canvas/1.5.5_Release for more information +- Drop hunspell.patch +- Add 0001-Make-sure-information-displayed-on-the-about-window-.patch + +------------------------------------------------------------------- Old: ---- hunspell.patch scribus-1.4.7.tar.xz scribus-icon128.png scribus-icon24.png scribus-icon256.png scribus-icon32.png scribus-icon64.png scribus.appdata.xml New: ---- 0001-Make-sure-information-displayed-on-the-about-window-.patch scribus-1.5.5.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scribus.spec ++++++ --- /var/tmp/diff_new_pack.Kkg5Zi/_old 2019-09-09 23:56:14.269236752 +0200 +++ /var/tmp/diff_new_pack.Kkg5Zi/_new 2019-09-09 23:56:14.277236751 +0200 @@ -1,7 +1,7 @@ # # 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. # # All modifications and additions to the file contributed by third parties @@ -18,52 +18,73 @@ Name: scribus -Version: 1.4.7 +Version: 1.5.5 Release: 0 Summary: Page Layout and Desktop Publishing (DTP) License: GPL-2.0-or-later Group: Productivity/Publishing/Other -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 +URL: https://www.scribus.net/ +# https://sourceforge.net/projects/scribus/files/scribus-devel/1.5.5/ +Source: %{name}-%{version}.tar.xz # 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 +Patch0: 0001-Make-sure-information-displayed-on-the-about-window-.patch +BuildRequires: breeze5-icons +BuildRequires: cmake BuildRequires: cups-devel +BuildRequires: dos2unix BuildRequires: fdupes -BuildRequires: fontconfig-devel -BuildRequires: hicolor-icon-theme -BuildRequires: hunspell-devel -BuildRequires: liblcms2-devel +BuildRequires: libcdr-devel +BuildRequires: libetonyek-devel +BuildRequires: libfreehand-devel +BuildRequires: libmspub-devel +BuildRequires: libpagemaker-devel BuildRequires: libpodofo-devel -BuildRequires: libqt4-devel >= 4.6.0 +BuildRequires: libqxp-devel +BuildRequires: librevenge-devel BuildRequires: libtiff-devel -BuildRequires: libxml2-devel -BuildRequires: openssl-devel +BuildRequires: libvisio-devel +BuildRequires: libwpd-devel +BuildRequires: libwpg-devel +BuildRequires: libzmf-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 +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: python2-Pillow +Recommends: python-tk +# Only available in graphics for the moment +Recommends: uniconvertor +Recommends: scribus-doc + +# Not packaged anymore +Provides: scribus-devel = %{version} +Obsoletes: scribus-devel < %{version} +%if 0%{?suse_version} > 1325 +BuildRequires: libboost_headers-devel +%else +BuildRequires: boost-devel %endif %description @@ -74,104 +95,81 @@ PDF creation, Encapsulated Postscript import and export and creation of color separations. -%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 devel -This package provides the development headers for Scribus, used for -developing Scribus plugins. +%package doc +Summary: Documentation for Scribus +Group: Documentation/HTML +Requires: %{name} -%prep +%description doc +This package provides the documentation for Scribus. -%setup -q -%patch -p1 +%prep +%autosetup -p1 +# W: wrong-script-end-of-line-encoding +dos2unix scribus/plugins/scriptplugin/scripts/Ligatursatz.py %build -# 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 - -export CXXFLAGS="%{optflags} -fno-strict-aliasing" -export CFLAGS="$CXXFLAGS" - +# Don't use the %%cmake macro, it causes crashes when starting scribus mkdir build pushd build -cmake \ +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_DISTROBUILD=1 \ -DWANT_HUNSPELL=1 \ - ../ - -make %{_smp_mflags} - -%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 - + -DWANT_GRAPHICSMAGICK=1 \ +%if "%{_lib}" == "lib64" + -DWANT_LIB64=1 %endif -%fdupes %{buildroot}/%{_prefix} +%cmake_build +popd -# INSTALL APPSTREAM METAINFO (SOURCE6) -install -Dm0644 %{S:6} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml +%install +%cmake_install -#update the mime database +mkdir -p %{buildroot}%{_datadir}/pixmaps +cp %{_datadir}/icons/breeze/apps/48/scribus.svg %{buildroot}%{_datadir}/pixmaps/ -%post -%mime_database_post -%desktop_database_post -%icon_theme_cache_post - -%postun -%mime_database_postun -%desktop_database_postun -%icon_theme_cache_postun +# These files are required at runtime to populate the help/about window +mkdir -p %{buildroot}%{_datadir}/scribus/aboutData +mv %{buildroot}%{_datadir}/doc/scribus/{AUTHORS,COPYING,LINKS,TRANSLATION} %{buildroot}%{_datadir}/scribus/aboutData/ + +# Already in %%doc +rm -f %{buildroot}%{_datadir}/doc/scribus/{ChangeLog,README} + +%fdupes %{buildroot}%{_datadir}/doc/scribus +%fdupes %{buildroot}%{_datadir}/scribus + +%suse_update_desktop_file -r scribus Qt Office WordProcessor + +%files doc +%license COPYING +%doc ChangeLog README +%dir %{_datadir}/doc/scribus/ +%lang(de) %{_datadir}/doc/scribus/de/ +%lang(it) %{_datadir}/doc/scribus/it/ +%{_datadir}/doc/scribus/en/ %files -%defattr(-,root,root) +%license COPYING +%doc ChangeLog README +%dir %{_datadir}/doc/scribus/ +%dir %{_datadir}/icons/hicolor/1024x1024 +%dir %{_datadir}/icons/hicolor/1024x1024/apps +%lang(de) %dir %{_mandir}/de +%lang(de) %dir %{_mandir}/de/man1 +%lang(de) %{_mandir}/de/man1/scribus.1%{?ext_man} +%lang(pl) %dir %{_mandir}/pl +%lang(pl) %dir %{_mandir}/pl/man1 +%lang(pl) %{_mandir}/pl/man1/scribus.1%{?ext_man} %{_bindir}/scribus -%{_mandir}/man?/*.* -%{_mandir}/*/man?/*.* -%{_libdir}/scribus +%{_datadir}/applications/scribus.desktop +%{_datadir}/icons/hicolor/*/apps/scribus.png +%{_datadir}/metainfo/scribus.appdata.xml %{_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 +%{_datadir}/pixmaps/scribus.svg +%{_datadir}/scribus/ +%{_libdir}/scribus/ +%{_mandir}/man1/scribus.1%{?ext_man} %changelog ++++++ 0001-Make-sure-information-displayed-on-the-about-window-.patch ++++++ >From c8877881e4439325137b5209037e76835a09444d Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <[email protected]> Date: Thu, 5 Sep 2019 12:16:58 +0200 Subject: [PATCH] Make sure information displayed on the about window are available The AUTHORS,COPYING,LINKS,TRANSLATION files are parsed to populate the help/about window. We must ensure these files are always available (including on live CD). --- scribus/ui/about.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scribus/ui/about.cpp b/scribus/ui/about.cpp index b70d1eb..d1a4f1b 100644 --- a/scribus/ui/about.cpp +++ b/scribus/ui/about.cpp @@ -179,7 +179,7 @@ About::About( QWidget* parent, AboutMode diaMode ) : QDialog( parent ) tabLayout->setSpacing( 6 ); tabLayout->setMargin( 10 ); authorView = new QTextBrowser( tab_2 ); - authorView->setHtml(About::parseAuthorFile(ScPaths::instance().docDir() + "AUTHORS")); + authorView->setHtml(About::parseAuthorFile(ScPaths::instance().shareDir() + "/aboutData/AUTHORS")); tabLayout->addWidget( authorView ); tabWidget2->addTab( tab_2, tr("A&uthors")); @@ -189,14 +189,14 @@ About::About( QWidget* parent, AboutMode diaMode ) : QDialog( parent ) tabLayout_2->setSpacing( 6 ); tabLayout_2->setMargin( 10 ); transView = new QTextBrowser( tab_3); - transView->setHtml(About::parseTranslationFile(ScPaths::instance().docDir() + "TRANSLATION")); + transView->setHtml(About::parseTranslationFile(ScPaths::instance().shareDir() + "/aboutData/TRANSLATION")); tabLayout_2->addWidget( transView ); tabWidget2->addTab( tab_3, tr( "&Translations" ) ); /*! ONLINE tab (03/04/2004 petr vanek) */ tab_4 = new QWidget( tabWidget2 ); onlineView = new QTextBrowser( tab_4 ); - onlineView->setHtml(About::parseLinksFile(ScPaths::instance().docDir() + "LINKS")); + onlineView->setHtml(About::parseLinksFile(ScPaths::instance().shareDir() + "/aboutData/LINKS")); onlineView->setOpenExternalLinks(true); tabLayout_4 = new QHBoxLayout( tab_4 ); tabLayout_4->setSpacing( 6 ); @@ -225,7 +225,7 @@ About::About( QWidget* parent, AboutMode diaMode ) : QDialog( parent ) textViewLicence = new QTextBrowser( tab_Licence); licenceLayout->addWidget( textViewLicence ); - QFile licenceFile(ScPaths::instance().docDir() + "/COPYING"); + QFile licenceFile(ScPaths::instance().shareDir() + "/aboutData/COPYING"); if (!licenceFile.open(QIODevice::ReadOnly | QIODevice::Text)) textViewLicence->setPlainText(tr("Unable to open licence file. Please check your install directory or the Scribus website for licencing information.") ); else -- 2.23.0 ++++++ scribus-1.4.7.tar.xz -> scribus-1.5.5.tar.xz ++++++ /work/SRC/openSUSE:Factory/scribus/scribus-1.4.7.tar.xz /work/SRC/openSUSE:Factory/.scribus.new.7948/scribus-1.5.5.tar.xz differ: char 26, line 1
