SHA256
1
0
forked from pool/scribus
Dominique Leuenberger 2018-05-08 11:36:56 +00:00 committed by Git OBS Bridge
commit d44f77a843
5 changed files with 30 additions and 22 deletions

View File

@ -11,7 +11,7 @@ diff -Nru a/cmake/modules/FindHUNSPELL.cmake b/cmake/modules/FindHUNSPELL.cmake
#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.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)

View File

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

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

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

View File

@ -1,3 +1,24 @@
-------------------------------------------------------------------
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
- 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
- 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

View File

@ -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+
@ -33,6 +33,7 @@ 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 +57,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 +67,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,7 +90,6 @@ Requires: zlib-devel
%description devel
This package provides the development headers for scribus. It is most useful
for developing scribus plugins.
@ -142,17 +140,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}
%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
@ -179,13 +170,9 @@ 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
%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