From f933067414d3fc989f8e741ece583149fdae173a0155b0f2ae91f30c62054c8b Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Sat, 28 Apr 2018 00:07:48 +0000 Subject: [PATCH 01/11] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/scribus?expand=0&rev=26 --- scribus-1.4.7.tar.xz | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 scribus-1.4.7.tar.xz 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 From 8cdda672f99cdd44b90ca856321c17b60ece30e0cb4b3867006ca333df76ce87 Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Sat, 28 Apr 2018 00:48:34 +0000 Subject: [PATCH 02/11] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/scribus?expand=0&rev=27 --- scribus.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scribus.spec b/scribus.spec index c4c2ab0..bc4a47d 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,7 +1,7 @@ # # spec file for package scribus # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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,7 +18,7 @@ Name: scribus -Version: 1.4.6 +Version: 1.4.7 Release: 0 Summary: Open Source Page Layout and Desktop Publishing (DTP) License: GPL-2.0+ From a56d053fc14ab6a2a2f0f4fa8291e71a069a2991b4f88925e8db6832fdfe7afa Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Sat, 28 Apr 2018 00:48:47 +0000 Subject: [PATCH 03/11] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/scribus?expand=0&rev=28 --- scribus-1.4.6.tar.xz | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 scribus-1.4.6.tar.xz diff --git a/scribus-1.4.6.tar.xz b/scribus-1.4.6.tar.xz deleted file mode 100644 index edd2c55..0000000 --- a/scribus-1.4.6.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:21e336500d9edc9c90ccf73087e5ef3df59ec3e4a3cbfec15367bcd8d078a19a -size 73601104 From da08a43b355f1ed3237901681902b549dcf5164b28666ee9e17855ae3294f022 Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Sat, 28 Apr 2018 00:52:28 +0000 Subject: [PATCH 04/11] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/scribus?expand=0&rev=29 --- scribus.changes | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/scribus.changes b/scribus.changes index 18f90fc..c12d6b2 100644 --- a/scribus.changes +++ b/scribus.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sat Apr 28 00:50:34 UTC 2018 - plinnell@opensuse.org + +- Update to 1.4.7 - likely last release from 1.4.x stable branch +- Stability and bugfix release +- Updated UI translations +- See: https://bugs.scribus.net/changelog_page.php?version_id=96 + for complete list. + ------------------------------------------------------------------- Tue Mar 27 14:53:05 UTC 2018 - wbauer@tmo.at From d80f22af91b3c1992b5e994f834e7143c58487c702d6085b7d95bc85d63a991a Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Sat, 28 Apr 2018 00:53:19 +0000 Subject: [PATCH 05/11] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/scribus?expand=0&rev=30 --- scribus.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scribus.spec b/scribus.spec index bc4a47d..2c75cc3 100644 --- a/scribus.spec +++ b/scribus.spec @@ -32,7 +32,7 @@ Source4: %{name}-icon128.png Source5: %{name}-icon256.png Source6: %{name}.appdata.xml # PATCH-FIX-OPENSUSE -Patch: hunspell-1.6.patch +#Patch: hunspell-1.6.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1325 BuildRequires: libboost_headers-devel @@ -98,7 +98,7 @@ for developing scribus plugins. %prep %setup -q -%patch -p1 +#patch -p1 %build # Delete non-free colour swatches (bnc#763586) From efc441f04bbd2253df2943dd19494f8a933979ab1b84bc8f3218bdf03579f5e1 Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Sat, 28 Apr 2018 22:24:41 +0000 Subject: [PATCH 06/11] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/scribus?expand=0&rev=31 --- scribus.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scribus.spec b/scribus.spec index 2c75cc3..cfd2236 100644 --- a/scribus.spec +++ b/scribus.spec @@ -150,9 +150,7 @@ install -D -m 0644 %{S:5} %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/%{n %fdupes -s %{buildroot}%{_includedir}/%{name}/ %fdupes -s %{buildroot}%{_datadir} -%if 0%{?suse_version} -%suse_update_desktop_file -i %{buildroot}%{_datadir}/mimelnk/application/vnd.scribus.desktop Office WordProcessor -%endif + # INSTALL APPSTREAM METAINFO (SOURCE6) install -Dm0644 %{S:6} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml From 1c1112d50554910a08de8c72ed339b78c4da617fedc092fb86d3a4adac7bde4c Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Sun, 29 Apr 2018 02:39:42 +0000 Subject: [PATCH 07/11] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/scribus?expand=0&rev=32 --- scribus.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/scribus.spec b/scribus.spec index cfd2236..7a06fcd 100644 --- a/scribus.spec +++ b/scribus.spec @@ -181,9 +181,6 @@ install -Dm0644 %{S:6} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml # This should be owned by filesystem or man, but there are only scribus files: %lang(pl) %dir %{_mandir}/pl %lang(pl) %{_mandir}/pl/man1 -%dir %{_datadir}/mimelnk -%dir %{_datadir}/mimelnk/application -%{_datadir}/mimelnk/application/vnd.scribus.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png %dir %{_datadir}/appdata %{_datadir}/appdata/%{name}.appdata.xml From 591e72d3463d64ce64827246cda8e55d61fc089cef7ea31f2aa31aafbf7efb98 Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Sun, 29 Apr 2018 03:00:40 +0000 Subject: [PATCH 08/11] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/scribus?expand=0&rev=33 --- scribus.spec | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/scribus.spec b/scribus.spec index 7a06fcd..85c15d0 100644 --- a/scribus.spec +++ b/scribus.spec @@ -31,8 +31,7 @@ Source3: %{name}-icon64.png Source4: %{name}-icon128.png Source5: %{name}-icon256.png Source6: %{name}.appdata.xml -# PATCH-FIX-OPENSUSE -#Patch: hunspell-1.6.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1325 BuildRequires: libboost_headers-devel @@ -56,7 +55,7 @@ BuildRequires: pkgconfig BuildRequires: python-devel BuildRequires: shared-mime-info BuildRequires: update-desktop-files -##BuildRequires: libMagick++-devel + %if 0%{?suse_version} Requires: ghostscript-library @@ -66,8 +65,6 @@ Suggests: AdobeICCProfiles Suggests: Uniconvertor %endif -Provides: scribus-templates > 1.2 -Obsoletes: scribus-templates =< 1.2 %description Scribus is a open source page layout program which @@ -91,14 +88,12 @@ Requires: zlib-devel %description devel - This package provides the development headers for scribus. It is most useful for developing scribus plugins. %prep %setup -q -#patch -p1 %build # Delete non-free colour swatches (bnc#763586) @@ -142,15 +137,10 @@ install -D -m 0644 %{S:5} %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/%{n %if 0%{?suse_version} %suse_update_desktop_file -r -i %{name} Qt Office Publishing WordProcessor -# hi-res icons are already installed in hicolor-icon-theme directory -# mkdir %{buildroot}%{_datadir}/pixmaps -# install -m 644 %{buildroot}%{_datadir}/%{name}/icons/%{name}.png %{buildroot}%{_datadir}/pixmaps/ + %endif %fdupes -s %{buildroot}%{_includedir}/%{name}/ -%fdupes -s %{buildroot}%{_datadir} - - # INSTALL APPSTREAM METAINFO (SOURCE6) install -Dm0644 %{S:6} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml @@ -177,7 +167,6 @@ install -Dm0644 %{S:6} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/scribus %{_datadir}/doc/scribus %{_datadir}/applications/%{name}.desktop -#%%{_datadir}/pixmaps/%%{name}.png # This should be owned by filesystem or man, but there are only scribus files: %lang(pl) %dir %{_mandir}/pl %lang(pl) %{_mandir}/pl/man1 From 83f43c85712c6cb1e946724e56f5d492cc6535572485e92ef8ff20a88fd9682a Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Sun, 29 Apr 2018 03:29:09 +0000 Subject: [PATCH 09/11] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/scribus?expand=0&rev=34 --- hunspell-1.6.patch | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 hunspell-1.6.patch diff --git a/hunspell-1.6.patch b/hunspell-1.6.patch deleted file mode 100644 index 71d7297..0000000 --- a/hunspell-1.6.patch +++ /dev/null @@ -1,18 +0,0 @@ -From: Wolfgang Bauer -Subject: support hunspell up to 1.6 - -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... ---- -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.3 hunspell-1.2 PATHS /opt/local/lib /usr/local/lib /usr/lib ) -+FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.6 hunspell-1.5 hunspell-1.4 hunspell-1.3 hunspell-1.2 PATHS /opt/local/lib /usr/local/lib /usr/lib ) - - INCLUDE(FindPackageHandleStandardArgs) - # handle the QUIETLY and REQUIRED arguments and set HUNSPELL_FOUND to TRUE From f7fe413272388c170ebc369182770d0017bbf92f4472635a906be39def466bc6 Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Sun, 29 Apr 2018 03:30:26 +0000 Subject: [PATCH 10/11] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/scribus?expand=0&rev=35 --- scribus.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scribus.changes b/scribus.changes index c12d6b2..024c9f7 100644 --- a/scribus.changes +++ b/scribus.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Sun Apr 29 03:29:26 UTC 2018 - plinnell@opensuse.org + +- drop hunspell-1.6.patch fixed uptream +- lots of spec file cleanups +------------------------------------------------------------------- Sat Apr 28 00:50:34 UTC 2018 - plinnell@opensuse.org - Update to 1.4.7 - likely last release from 1.4.x stable branch From 9e589ec546cbca4b5ddc8a37db659bee7c0a870b975945bc35cc5227eb40992a Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Tue, 1 May 2018 23:17:05 +0000 Subject: [PATCH 11/11] Accepting request 602857 from home:wolfi323:branches:KDE:Extra - Add back hunspell-1.6.patch, it's still needed as the current version still only supports hunspell up to 1.4 but Tumbleweed and Leap 15.0 have 1.6 Hunspell 1.6 is only supported in 1.5.x, where the hunspell detection has been reworked... OBS-URL: https://build.opensuse.org/request/show/602857 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/scribus?expand=0&rev=36 --- hunspell-1.6.patch | 18 ++++++++++++++++++ scribus.changes | 7 +++++++ scribus.spec | 3 +++ 3 files changed, 28 insertions(+) create mode 100644 hunspell-1.6.patch diff --git a/hunspell-1.6.patch b/hunspell-1.6.patch new file mode 100644 index 0000000..afcf234 --- /dev/null +++ b/hunspell-1.6.patch @@ -0,0 +1,18 @@ +From: Wolfgang Bauer +Subject: support hunspell up to 1.6 + +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... +--- +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-1.6 hunspell-1.5 hunspell-1.4 hunspell-1.3 hunspell-1.2 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.changes b/scribus.changes index 024c9f7..932f7a3 100644 --- a/scribus.changes +++ b/scribus.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue May 1 21:29:52 UTC 2018 - wbauer@tmo.at + +- Add back hunspell-1.6.patch, it's still needed as the current + version still only supports hunspell up to 1.4 but Tumbleweed and + Leap 15.0 have 1.6 + ------------------------------------------------------------------- Sun Apr 29 03:29:26 UTC 2018 - plinnell@opensuse.org diff --git a/scribus.spec b/scribus.spec index 85c15d0..1270fe1 100644 --- a/scribus.spec +++ b/scribus.spec @@ -31,6 +31,8 @@ Source3: %{name}-icon64.png Source4: %{name}-icon128.png Source5: %{name}-icon256.png Source6: %{name}.appdata.xml +# PATCH-FIX-OPENSUSE +Patch: hunspell-1.6.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1325 @@ -94,6 +96,7 @@ for developing scribus plugins. %prep %setup -q +%patch -p1 %build # Delete non-free colour swatches (bnc#763586)