pool/lyx
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 713564 from Publishing

Browse Source 
- Add README.SUSE and refer to that in %description to explain
  limited functionality of ImageMagick in openSUSE

- Update the description in the spec file with information on
  security setting for ImageMagick in openSUSE. See boo#1139928
  It seems the only thing we can do about it.

- Update to 2.3.3:
  This is a bugfix release with only minor improvements that are
  not really bugfixes. The many details can be found here:
  https://www.lyx.org/announce/2_3_3.txt
- Removed upstream patch: fix_boost_169.patch
- Improved spec file a bit

OBS-URL: https://build.opensuse.org/request/show/713564
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lyx?expand=0&rev=92
This commit is contained in:
Dominique Leuenberger 2019-07-11 11:15:41 +00:00 committed by Git OBS Bridge
commit 5fc8cf6303
8 changed files with 63 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
README.SUSE Normal file
View File

@ -0,0 +1,21 @@
LyX makes use of ImageMagick, a.o. for showing previews of images in
the LyX windows. In openSUSE some functionality of ImageMagick is
disabled for security reasons. This is true for all postscripts
files. Showing an eps image in LyX, therefore, does not work out of
the box.
If you want to enable some disabled functionality, you can edit the
settings in /etc/ImageMagick-7, if you know what you are doing. An
alternative is to remove the package with the default SUSE setting
and install the upstream version: ImageMagick-config-7-SUSE must be
replaced by ImageMagick-config-7-upstream.
More information can be found in this announcement:
https://lists.opensuse.org/opensuse-security-announce/2019-05/msg00010.html
More information on ImageMagick security settings can be found here:
https://imagemagick.org/script/security-policy.php

19
fix_boost_169.patch
View File

@ -1,19 +0,0 @@
diff -ur a/src/support/FileName.cpp b/src/support/FileName.cpp
--- a/src/support/FileName.cpp 2018-12-09 21:04:52.000000000 +0100
+++ b/src/support/FileName.cpp 2019-03-15 14:56:04.220000000 +0100
@@ -67,15 +67,6 @@
using namespace std;
using namespace lyx::support;
-// OK, this is ugly, but it is the only workaround I found to compile
-// with gcc (any version) on a system which uses a non-GNU toolchain.
-// The problem is that gcc uses a weak symbol for a particular
-// instantiation and that the system linker usually does not
-// understand those weak symbols (seen on HP-UX, tru64, AIX and
-// others). Thus we force an explicit instanciation of this particular
-// template (JMarc)
-template struct boost::detail::crc_table_t<32, 0x04C11DB7, true>;
-
namespace lyx {
namespace support {

3
lyx-2.3.2.tar.xz
View File

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

BIN
lyx-2.3.2.tar.xz.sig
View File

Binary file not shown.

3
lyx-2.3.3.tar.xz Normal file
View File

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

BIN
lyx-2.3.3.tar.xz.sig Normal file
View File

Binary file not shown.

23
lyx.changes
View File

@ -1,3 +1,26 @@
-------------------------------------------------------------------
Thu Jul 4 15:12:50 UTC 2019 - Cor Blom <cornelis@solcon.nl>
- Add README.SUSE and refer to that in %description to explain
limited functionality of ImageMagick in openSUSE
-------------------------------------------------------------------
Wed Jul 3 19:43:35 UTC 2019 - Cor Blom <cornelis@solcon.nl>
- Update the description in the spec file with information on
security setting for ImageMagick in openSUSE. See boo#1139928
It seems the only thing we can do about it.
-------------------------------------------------------------------
Tue Jun 25 18:39:19 UTC 2019 - Cor Blom <cornelis@solcon.nl>
- Update to 2.3.3:
This is a bugfix release with only minor improvements that are
not really bugfixes. The many details can be found here:
https://www.lyx.org/announce/2_3_3.txt
- Removed upstream patch: fix_boost_169.patch
- Improved spec file a bit
-------------------------------------------------------------------
Fri Mar 15 13:49:18 UTC 2019 - Cor Blom <cornelis@solcon.nl>

32
lyx.spec
View File

@ -12,29 +12,27 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: lyx
Version: 2.3.2
Version: 2.3.3
Release: 0
Summary: WYSIWYM (What You See Is What You Mean) document processor
License: GPL-2.0-or-later
Group: Productivity/Publishing/TeX/Frontends
Url: http://www.lyx.org/
URL: http://www.lyx.org/
Source: ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/lyx-%{version}.tar.xz
Source1: lyxrc.dist
Source2: lyx.keyring
Source3: ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/lyx-%{version}.tar.xz.sig
Source4: README.SUSE
# PATCH-FIX-UPSTREAM to satisfy rpmlint - use #! /usr/bin/python as shebang
# See: https://www.lyx.org/trac/changeset/cac27076ead10684270520670adc6bd004793361/lyxgit
# Upstream also made change to python3 in master. Because 2.3.1 is compatible with both
# python2 and 3 we follow and switch to python3
Patch0: correct-shebang.patch
# PATCH-FIX-UPSTREAM: fix build with boost 1.69
Patch1: fix_boost_169.patch
#!BuildIgnore: lyx
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bc
@ -43,14 +41,11 @@ BuildRequires: fdupes
BuildRequires: file-devel
BuildRequires: hicolor-icon-theme
BuildRequires: hunspell-devel
BuildRequires: libboost_headers-devel
BuildRequires: pkgconfig
BuildRequires: python3
BuildRequires: update-desktop-files
BuildRequires: zlib-devel
Requires: ImageMagick
Requires: ghostscript
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: libboost_headers-devel
BuildRequires: pkgconfig(Qt5Concurrent)
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5DBus)
@ -61,6 +56,9 @@ BuildRequires: pkgconfig(Qt5Sql)
BuildRequires: pkgconfig(Qt5Svg)
BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(Qt5Xml)
#!BuildIgnore: lyx
Requires: ImageMagick
Requires: ghostscript
# Goal is to require/recommends (roughly) everything that is supported in the GUI of LyX
# LyX can supoort everything of LaTeX in the preamble, but not everything is supported in the GUI
# I have ingored extra fonts and document classes
@ -118,10 +116,13 @@ have different formats, such as DVI, postscript, PDF, html.
LyX can check the LaTeX installation by opening the LaTeX Configuration
document under "Help" on the menubar.
LyX uses ImageMagick to deal with images. For security reasons
(open)SUSE limits the functionaly of ImageMagick. See README.SUSE
(in /usr/share/doc/packages/lyx/) for more information.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
#./autogen.sh
@ -152,7 +153,7 @@ pushd %{buildroot}%{_datadir}/lyx/doc/
popd
cp ANNOUNCE COPYING NEWS \
README README.localization RELEASE-NOTES UPGRADING \
README README.localization RELEASE-NOTES UPGRADING %{SOURCE4} \
%{buildroot}/%{_defaultdocdir}/%{name}/
mkdir -p $RPM_BUILD_ROOT$TEXMF/tex/latex
@ -177,7 +178,6 @@ install -p -D -m 0644 lib/scripts/bash_completion %{buildroot}%{_datadir}/bash-c
%icon_theme_cache_postun
%files -f %{name}.lang
%defattr(-,root,root)
%docdir %{_datadir}/lyx/doc
%doc %{_defaultdocdir}/lyx
%{_bindir}/lyx
@ -192,9 +192,9 @@ install -p -D -m 0644 lib/scripts/bash_completion %{buildroot}%{_datadir}/bash-c
%dir %{_datadir}/texmf/tex/latex
%{_datadir}/texmf/tex/latex/lyx
%{_datadir}/lyx
%{_mandir}/man1/lyx.1%{ext_man}
%{_mandir}/man1/lyxclient.1%{ext_man}
%{_mandir}/man1/tex2lyx.1%{ext_man}
%{_mandir}/man1/lyx.1%{?ext_man}
%{_mandir}/man1/lyxclient.1%{?ext_man}
%{_mandir}/man1/tex2lyx.1%{?ext_man}
%{_datadir}/bash-completion/completions/lyx
%changelog