From 30a76c17103252aa67687593fe378675219da45b4b3676011a3ef38e41fa8aa6 Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Tue, 25 Jun 2019 18:44:32 +0000 Subject: [PATCH 1/6] - 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 patches: correct-shebang.patch and fix_boost_169.patch OBS-URL: https://build.opensuse.org/package/show/Publishing/lyx?expand=0&rev=167 --- lyx-2.3.2.tar.xz | 3 --- lyx-2.3.2.tar.xz.sig | Bin 287 -> 0 bytes lyx-2.3.3.tar.xz | 3 +++ lyx-2.3.3.tar.xz.sig | Bin 0 -> 287 bytes lyx.changes | 10 ++++++++++ lyx.spec | 13 ++----------- 6 files changed, 15 insertions(+), 14 deletions(-) delete mode 100644 lyx-2.3.2.tar.xz delete mode 100644 lyx-2.3.2.tar.xz.sig create mode 100644 lyx-2.3.3.tar.xz create mode 100644 lyx-2.3.3.tar.xz.sig diff --git a/lyx-2.3.2.tar.xz b/lyx-2.3.2.tar.xz deleted file mode 100644 index a3b6db1..0000000 --- a/lyx-2.3.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f1a80fc7d0c69e5a28145275dd4f88d2a93bad1033b0cffe953f668fbbe4956c -size 15791748 diff --git a/lyx-2.3.2.tar.xz.sig b/lyx-2.3.2.tar.xz.sig deleted file mode 100644 index 724e12bf9a2db341fe1308dd1a7697fc923956b5157d0f255bfc7e34242336f9..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 287 zcmV+)0pR|L0UQJX0RjL91p-_Rb6UBqpJ?$$i6m=SWJ^cP;5x48t`OJ_`ch@Kx{{NJxi7G0Lk7){g-^zJ z{-;J4VSQ^5b*N>YsS2yya)D3I2bjVO3Jjdz)}8g~HLny55p9oJOrHP*Z2Ape@G+&X lEo+nU8Gm2CI!%|tt+YZEEnq%+2uf{5lS9Hn(rAJ0Hlv*Dh+_Z% diff --git a/lyx-2.3.3.tar.xz b/lyx-2.3.3.tar.xz new file mode 100644 index 0000000..12cdc7d --- /dev/null +++ b/lyx-2.3.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:991eefebddb281d276a7693f8ac119bd971aab3fa9f554cd14e4b68b04284e39 +size 15998188 diff --git a/lyx-2.3.3.tar.xz.sig b/lyx-2.3.3.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..11a7375d3268ade57454e45f738b31a36a6cc066bbdb37776dba41801cbd41f8 GIT binary patch literal 287 zcmV+)0pR|L0UQJX0RjL91p-|DtMvd12@u|TMEb}3I4$*{2mpkkBR&+?YZ4>PZv?y5 zd=$Lp!2Mx7?b7k;E;uSgHJg_ygl)I4z|xFg-`wK+F&Lh=m~zm~PsCSm$;^NUi>{xQ z8k&UZP?iw~AfnxM(j}KluJTDXg)oeh{@QP&qwjwP7AXNTn=Ww#EeH;tS)XbGqb6e< zId-J+k>=!27QKnZB4#A!gltW)b5E@&({OpZXy8t^8HsPU79XwXJH_s2F_u1kjasq1 zA#*6oL-C&*DLajSfJ|GSTJ=5`ZL_4ARBrf~Y62@m6E>A=+shx#;rerAUdd9#ozc2| lq^-~|_`Vgv;iTqDc5(T{?D!Esz=PR>sQ2J3{sZxLb_qugi)sJ> literal 0 HcmV?d00001 diff --git a/lyx.changes b/lyx.changes index fa3ec8a..5bf0835 100644 --- a/lyx.changes +++ b/lyx.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Jun 25 18:39:19 UTC 2019 - Cor Blom + +- 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 patches: correct-shebang.patch and + fix_boost_169.patch + ------------------------------------------------------------------- Fri Mar 15 13:49:18 UTC 2019 - Cor Blom diff --git a/lyx.spec b/lyx.spec index 652eb8b..72de583 100644 --- a/lyx.spec +++ b/lyx.spec @@ -12,12 +12,12 @@ # 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 @@ -27,13 +27,6 @@ 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 -# 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 @@ -120,8 +113,6 @@ document under "Help" on the menubar. %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build #./autogen.sh From 12391ec1b4781d5d48c1fed5cc4801e84ec85020e60f0c5e121f5297e61c119f Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Tue, 25 Jun 2019 19:04:12 +0000 Subject: [PATCH 2/6] OBS-URL: https://build.opensuse.org/package/show/Publishing/lyx?expand=0&rev=168 --- lyx.changes | 3 +-- lyx.spec | 6 ++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lyx.changes b/lyx.changes index 5bf0835..5316365 100644 --- a/lyx.changes +++ b/lyx.changes @@ -5,8 +5,7 @@ Tue Jun 25 18:39:19 UTC 2019 - Cor Blom 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 patches: correct-shebang.patch and - fix_boost_169.patch +- Removed upstream patch: fix_boost_169.patch ------------------------------------------------------------------- Fri Mar 15 13:49:18 UTC 2019 - Cor Blom diff --git a/lyx.spec b/lyx.spec index 72de583..3dd7994 100644 --- a/lyx.spec +++ b/lyx.spec @@ -27,6 +27,11 @@ 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 +# 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 #!BuildIgnore: lyx BuildRequires: autoconf BuildRequires: automake @@ -113,6 +118,7 @@ document under "Help" on the menubar. %prep %setup -q +%patch0 -p1 %build #./autogen.sh From 7de93b19a381d70dd5b013c35b42bcd6d29ff406b28a3ccf9bc1acbd5e9e4058 Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Tue, 25 Jun 2019 19:26:42 +0000 Subject: [PATCH 3/6] - Improved spec file a bit OBS-URL: https://build.opensuse.org/package/show/Publishing/lyx?expand=0&rev=169 --- fix_boost_169.patch | 19 ------------------- lyx.changes | 1 + lyx.spec | 18 ++++++++---------- 3 files changed, 9 insertions(+), 29 deletions(-) delete mode 100644 fix_boost_169.patch diff --git a/fix_boost_169.patch b/fix_boost_169.patch deleted file mode 100644 index 15df6f8..0000000 --- a/fix_boost_169.patch +++ /dev/null @@ -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 { - diff --git a/lyx.changes b/lyx.changes index 5316365..c36a857 100644 --- a/lyx.changes +++ b/lyx.changes @@ -6,6 +6,7 @@ Tue Jun 25 18:39:19 UTC 2019 - Cor Blom 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 diff --git a/lyx.spec b/lyx.spec index 3dd7994..091884d 100644 --- a/lyx.spec +++ b/lyx.spec @@ -22,7 +22,7 @@ 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 @@ -32,7 +32,6 @@ Source3: ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/lyx-%{version}.tar.xz.sig # 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 -#!BuildIgnore: lyx BuildRequires: autoconf BuildRequires: automake BuildRequires: bc @@ -41,14 +40,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) @@ -59,6 +55,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 @@ -174,7 +173,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 @@ -189,9 +187,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 From c9f740f08a18503e261dd6aff05dcee7ef3d9c5b08e75057b807619e95e4605d Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Wed, 3 Jul 2019 19:49:48 +0000 Subject: [PATCH 4/6] - 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. OBS-URL: https://build.opensuse.org/package/show/Publishing/lyx?expand=0&rev=170 --- lyx.changes | 7 +++++++ lyx.spec | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/lyx.changes b/lyx.changes index c36a857..4752046 100644 --- a/lyx.changes +++ b/lyx.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jul 3 19:43:35 UTC 2019 - Cor Blom + +- 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 diff --git a/lyx.spec b/lyx.spec index 091884d..c4bf835 100644 --- a/lyx.spec +++ b/lyx.spec @@ -115,6 +115,11 @@ 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. Be aware that some functionaly +of ImageMagick is disable in openSUSE for security reasons. Remove +ImageMagick-config-7-SUSE and install ImageMagick-config-7-upstream to +restore support for some images, like eps. + %prep %setup -q %patch0 -p1 From 112b4b82ed8716b869d629a328143a6766f59eed41fd3e0fa3c01ae176c3a1f6 Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Thu, 4 Jul 2019 15:14:17 +0000 Subject: [PATCH 5/6] - Add README.SUSE and refer to that in %description to explain limited functionality of ImageMagick in openSUSE OBS-URL: https://build.opensuse.org/package/show/Publishing/lyx?expand=0&rev=171 --- README.SUSE | 4 ++++ lyx.changes | 6 ++++++ lyx.spec | 10 +++++----- 3 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 README.SUSE diff --git a/README.SUSE b/README.SUSE new file mode 100644 index 0000000..fc1f1cc --- /dev/null +++ b/README.SUSE @@ -0,0 +1,4 @@ +LyX makes use of ImageMagick, a.o. for showing previews of images in the LyX windows. In (open)SUSE 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. A postscript file has some functionality of a program, so it is safer to have this functionality disabled. + +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. + diff --git a/lyx.changes b/lyx.changes index 4752046..669f038 100644 --- a/lyx.changes +++ b/lyx.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jul 4 15:12:50 UTC 2019 - Cor Blom + +- 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 diff --git a/lyx.spec b/lyx.spec index c4bf835..93c8a68 100644 --- a/lyx.spec +++ b/lyx.spec @@ -27,6 +27,7 @@ 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 @@ -115,10 +116,9 @@ 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. Be aware that some functionaly -of ImageMagick is disable in openSUSE for security reasons. Remove -ImageMagick-config-7-SUSE and install ImageMagick-config-7-upstream to -restore support for some images, like eps. +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 @@ -153,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 From bcce492ded15a2eed3ce94a0fe2691fda1250fe729f25c02c64fd7ad88628b54 Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Thu, 4 Jul 2019 21:02:58 +0000 Subject: [PATCH 6/6] improve README.SUSE and adding some links with more information OBS-URL: https://build.opensuse.org/package/show/Publishing/lyx?expand=0&rev=172 --- README.SUSE | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/README.SUSE b/README.SUSE index fc1f1cc..25995c5 100644 --- a/README.SUSE +++ b/README.SUSE @@ -1,4 +1,21 @@ -LyX makes use of ImageMagick, a.o. for showing previews of images in the LyX windows. In (open)SUSE 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. A postscript file has some functionality of a program, so it is safer to have this functionality disabled. +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 -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.