From a1955d4b5e897d6e93184776f89102a4047041f91d7fd071c3973049f53baab1 Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Sun, 11 Dec 2022 20:52:09 +0000 Subject: [PATCH 1/3] 2.3.7 OBS-URL: https://build.opensuse.org/package/show/Publishing/lyx?expand=0&rev=217 --- lyx-2.3.7.tar.xz | 3 +++ lyx-2.3.7.tar.xz.sig | Bin 0 -> 310 bytes lyx.spec | 4 +--- 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 lyx-2.3.7.tar.xz create mode 100644 lyx-2.3.7.tar.xz.sig diff --git a/lyx-2.3.7.tar.xz b/lyx-2.3.7.tar.xz new file mode 100644 index 0000000..e755074 --- /dev/null +++ b/lyx-2.3.7.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:306427eed437287f3c5d6a74b4264ac3dc13d48ff67e7c60dd6bc56f0ddb50ab +size 16174532 diff --git a/lyx-2.3.7.tar.xz.sig b/lyx-2.3.7.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..054f43b3cbb0091129b28b06a6a8de3693af1bb9a58f0f03eb97b93ada94ab0a GIT binary patch literal 310 zcmV-60m=S}0W$;u0SEvc79j-wW=9)CRhI{^+Syg!dPMri`#3EH0%Mi{9RLam5Z-!3 z`p5e?EtJK$yw zd!yS?-Gft);ZZ!GIUS9=LNm}RsLeWj2=@>yD4?UT9!`uanQ| zt|E_rb;mZbkAh4YyQla4y&A0Putu}BHz?;Ci(mRPvd!&F8N#brO5gd-vRJs&`&UY= z1C`I=$i(S%-4WZ$Z8?@&x5r6|7#u!HHEy8TBTjJoMmpGt{JW}9`wqM)DFfgxI$$x;JfqnLQJe-es{lLu&IoFmi60ji9 IY}N9kp4uIm00000 literal 0 HcmV?d00001 diff --git a/lyx.spec b/lyx.spec index d6a5ecd..a602c3a 100644 --- a/lyx.spec +++ b/lyx.spec @@ -17,7 +17,7 @@ Name: lyx -Version: 2.3.6.1 +Version: 2.3.7 Release: 0 Summary: WYSIWYM (What You See Is What You Mean) document processor License: GPL-2.0-or-later @@ -36,8 +36,6 @@ Patch0: correct-shebang.patch # PATCH-FIX-UPSTREAM remove_python_shebang.patch mcepl@suse.com # remove all instances of python2 shebang lines Patch1: remove_python_shebang.patch -# Fix build with gcc-12 -Patch2: lyx-2.3.6-fix-gcc12.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bc From c722fd9b7df63edc385646af2304f842d7779bcea4436f2520d99de55ace87a0 Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Mon, 12 Dec 2022 07:27:33 +0000 Subject: [PATCH 2/3] - Update to 2.3.7: * Small improvements and bug fixes all over the place. For details see included ANNOUNCE or https://www.lyx.org/announce/2_3_7.txt - Remove lyx-2.3.6-fix-gcc12.patch OBS-URL: https://build.opensuse.org/package/show/Publishing/lyx?expand=0&rev=218 --- lyx-2.3.6-fix-gcc12.patch | 24 ------------------------ lyx-2.3.6.1.tar.xz | 3 --- lyx-2.3.6.1.tar.xz.sig | Bin 310 -> 0 bytes lyx.changes | 9 +++++++++ 4 files changed, 9 insertions(+), 27 deletions(-) delete mode 100644 lyx-2.3.6-fix-gcc12.patch delete mode 100644 lyx-2.3.6.1.tar.xz delete mode 100644 lyx-2.3.6.1.tar.xz.sig diff --git a/lyx-2.3.6-fix-gcc12.patch b/lyx-2.3.6-fix-gcc12.patch deleted file mode 100644 index 5c819a3..0000000 --- a/lyx-2.3.6-fix-gcc12.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ur lyx-2.3.6.1.orig/src/insets/InsetListings.cpp lyx-2.3.6.1/src/insets/InsetListings.cpp ---- lyx-2.3.6.1.orig/src/insets/InsetListings.cpp 2020-12-29 16:50:45.000000000 +0000 -+++ lyx-2.3.6.1/src/insets/InsetListings.cpp 2022-02-03 16:22:37.983196716 +0000 -@@ -44,6 +44,7 @@ - - #include "support/regex.h" - -+#include - #include - - using namespace std; -Only in lyx-2.3.6.1/src/insets: InsetListings.cpp~ -diff -ur lyx-2.3.6.1.orig/src/lyxfind.cpp lyx-2.3.6.1/src/lyxfind.cpp ---- lyx-2.3.6.1.orig/src/lyxfind.cpp 2020-12-29 16:50:45.000000000 +0000 -+++ lyx-2.3.6.1/src/lyxfind.cpp 2022-02-03 16:01:54.997152176 +0000 -@@ -52,6 +52,7 @@ - #include "support/lstrings.h" - - #include "support/regex.h" -+#include - - using namespace std; - using namespace lyx::support; -Only in lyx-2.3.6.1/src: lyxfind.cpp~ diff --git a/lyx-2.3.6.1.tar.xz b/lyx-2.3.6.1.tar.xz deleted file mode 100644 index 797ca1e..0000000 --- a/lyx-2.3.6.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c6bed2633419898e01a7cc350310d7d934bf591cab7259fc2581aa4c00eafa78 -size 16242608 diff --git a/lyx-2.3.6.1.tar.xz.sig b/lyx-2.3.6.1.tar.xz.sig deleted file mode 100644 index aff761dddf162131d8e8b82573bce1beec2650b43dbfa02d3019dc41ce84aa19..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 310 zcmV-60m=S}0W$;u0SEvc79j-wW=9)CRhI{^+Syg!dPMri`#3EH0$=N1vH%JR5Z-!3 z`p5e?E&p=|{yGp@Ag$CemVy+~PP5s=UT7u&ApBPf?R+wEs;PTWq6mN%x4`4Xeb*u` zsU@-+EgD!Xi{jV+tS_+6L1segv7E>$jzmwIee!pnV&VzNSjst=QJ1kB6BmQhKLgUHjOH8o!j90hGQYlLTX~s+q z;lX~s<@JQM7;6sk8vg60jG9JUUB8uB85KCnQ**{ePeq16mvyDXLY7g{$xH?ME-HT+ zM^_G!=W`~{YSFaiQe=kw{6kWdZiMQ*FVLw?035(3yB(Z>?U6!uM*Ziq*||~VX5M|W I!RMQaBDuPiMF0Q* diff --git a/lyx.changes b/lyx.changes index 64f3a58..d3b2598 100644 --- a/lyx.changes +++ b/lyx.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Dec 12 07:24:12 UTC 2022 - Cor Blom + +- Update to 2.3.7: + * Small improvements and bug fixes all over the place. For + details see included ANNOUNCE + or https://www.lyx.org/announce/2_3_7.txt +- Remove lyx-2.3.6-fix-gcc12.patch + ------------------------------------------------------------------- Sat May 14 14:28:50 UTC 2022 - Cor Blom From 4c6033c9768a4bc2cc03bdf8c2ebd7e6b8ec91e6ce12e0c79f2e28382df9b8cb Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Mon, 2 Jan 2023 09:05:29 +0000 Subject: [PATCH 3/3] - Updated tarballs, still 2.3.7, although the tarballs add a -1 OBS-URL: https://build.opensuse.org/package/show/Publishing/lyx?expand=0&rev=219 --- lyx-2.3.7-1.tar.xz | 3 +++ lyx-2.3.7-1.tar.xz.sig | Bin 0 -> 310 bytes lyx-2.3.7.tar.xz | 3 --- lyx-2.3.7.tar.xz.sig | Bin 310 -> 0 bytes lyx.changes | 5 +++++ lyx.spec | 6 +++--- 6 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 lyx-2.3.7-1.tar.xz create mode 100644 lyx-2.3.7-1.tar.xz.sig delete mode 100644 lyx-2.3.7.tar.xz delete mode 100644 lyx-2.3.7.tar.xz.sig diff --git a/lyx-2.3.7-1.tar.xz b/lyx-2.3.7-1.tar.xz new file mode 100644 index 0000000..72725b3 --- /dev/null +++ b/lyx-2.3.7-1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:39be8864fb86b34e88310e70fb80e5e9e296601f0856cf161aa094171718d8ed +size 16158416 diff --git a/lyx-2.3.7-1.tar.xz.sig b/lyx-2.3.7-1.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..1bb26014beb16e72d983b05899fef27c4e4910662d80e73e08a3c0a842d7a4db GIT binary patch literal 310 zcmV-60m=S}0W$;u0SEvc79j-wW=9)CRhI{^+Syg!dPMri`#3EH0%NinFaQb(5Z-!3 z`p5e?ErNXq{TAodwNSYSxn5SpVFd3!|E(^OcxE`9uvK0?&F3Ni5X9SS0<@xgcO;+>=JLNBUQZ9pjSSRLV^g?j-t5<^OnY zEzN{X`pRE=5O+^wG&0;w^+2Gclixp0!moz~%t7NM&zj-46;mz^$XLDDS`*ACAR>Nx zf`>L_WD^+SugWD7{#&rqvL^3s6O`2?Tyi9PqDgEF2f$+>l*Ter^S^j@>LG>xPY4i( z($K>p2aX|}&0?24n9mLTzXw@(b;eOW6?#a#>0fw9ziq@@aH Iy?7HwzJ`sD00000 literal 0 HcmV?d00001 diff --git a/lyx-2.3.7.tar.xz b/lyx-2.3.7.tar.xz deleted file mode 100644 index e755074..0000000 --- a/lyx-2.3.7.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:306427eed437287f3c5d6a74b4264ac3dc13d48ff67e7c60dd6bc56f0ddb50ab -size 16174532 diff --git a/lyx-2.3.7.tar.xz.sig b/lyx-2.3.7.tar.xz.sig deleted file mode 100644 index 054f43b3cbb0091129b28b06a6a8de3693af1bb9a58f0f03eb97b93ada94ab0a..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 310 zcmV-60m=S}0W$;u0SEvc79j-wW=9)CRhI{^+Syg!dPMri`#3EH0%Mi{9RLam5Z-!3 z`p5e?EtJK$yw zd!yS?-Gft);ZZ!GIUS9=LNm}RsLeWj2=@>yD4?UT9!`uanQ| zt|E_rb;mZbkAh4YyQla4y&A0Putu}BHz?;Ci(mRPvd!&F8N#brO5gd-vRJs&`&UY= z1C`I=$i(S%-4WZ$Z8?@&x5r6|7#u!HHEy8TBTjJoMmpGt{JW}9`wqM)DFfgxI$$x;JfqnLQJe-es{lLu&IoFmi60ji9 IY}N9kp4uIm00000 diff --git a/lyx.changes b/lyx.changes index d3b2598..5181c50 100644 --- a/lyx.changes +++ b/lyx.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 2 09:04:28 UTC 2023 - Cor Blom + +- Updated tarballs, still 2.3.7, although the tarballs add a -1 + ------------------------------------------------------------------- Mon Dec 12 07:24:12 UTC 2022 - Cor Blom diff --git a/lyx.spec b/lyx.spec index a602c3a..228b217 100644 --- a/lyx.spec +++ b/lyx.spec @@ -1,7 +1,7 @@ # # spec file for package lyx # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,10 +23,10 @@ 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/ -Source: ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/lyx-%{version}.tar.xz +Source: ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/lyx-%{version}-1.tar.xz Source1: lyxrc.dist Source2: lyx.keyring -Source3: ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/lyx-%{version}.tar.xz.sig +Source3: ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/lyx-%{version}-1.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