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

Accepting request 635590 from Publishing

Browse Source 
2.3.1

OBS-URL: https://build.opensuse.org/request/show/635590
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lyx?expand=0&rev=88
This commit is contained in:
Yuchen Lin
2018-09-15 13:40:26 +00:00
committed by Git OBS Bridge
parent a0ed843000 74f87d8c85
commit 1d089951a1
8 changed files with 108 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
correct-shebang.patch Normal file
View File

@@ -0,0 +1,54 @@
diff -ur a/lib/configure.py b/lib/configure.py
--- a/lib/configure.py 2018-08-28 21:49:44.000000000 +0200
+++ b/lib/configure.py 2018-08-29 23:44:58.310928948 +0200
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python3
# -*- coding: utf-8 -*-
#
# file configure.py
diff -ur a/lib/lyx2lyx/lyx2lyx b/lib/lyx2lyx/lyx2lyx
--- a/lib/lyx2lyx/lyx2lyx 2018-08-28 21:49:44.000000000 +0200
+++ b/lib/lyx2lyx/lyx2lyx 2018-08-29 23:46:17.080401969 +0200
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python3
# -*- coding: utf-8 -*-
# Copyright (C) 2002-2011 The LyX Team
# Copyright (C) 2002-2007 José Matos <jamatos@lyx.org>
diff -ur a/lib/lyx2lyx/profiling.py b/lib/lyx2lyx/profiling.py
--- a/lib/lyx2lyx/profiling.py 2018-08-28 21:49:44.000000000 +0200
+++ b/lib/lyx2lyx/profiling.py 2018-08-29 23:46:36.432763866 +0200
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python3
# -*- coding: utf-8 -*-
# Copyright (C) 2004 José Matos <jamatos@lyx.org>
#
diff -ur a/lib/scripts/listerrors b/lib/scripts/listerrors
--- a/lib/scripts/listerrors 2018-08-28 21:49:44.000000000 +0200
+++ b/lib/scripts/listerrors 2018-08-29 23:47:06.305322496 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
# file listerrors
# This file is part of LyX, the document processor.
diff -ur a/lib/scripts/svg2pdftex.py b/lib/scripts/svg2pdftex.py
--- a/lib/scripts/svg2pdftex.py 2018-08-28 21:49:44.000000000 +0200
+++ b/lib/scripts/svg2pdftex.py 2018-08-29 23:47:27.381716633 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
# -*- coding: utf-8 -*-
# file svg2pdftex.py
diff -ur a/lib/scripts/svg2pstex.py b/lib/scripts/svg2pstex.py
--- a/lib/scripts/svg2pstex.py 2018-08-28 21:49:44.000000000 +0200
+++ b/lib/scripts/svg2pstex.py 2018-08-29 23:47:42.970008140 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
# -*- coding: utf-8 -*-
# file svg2pstex.py

16
fix-build-with-Qt5.11.patch
View File

@@ -1,16 +0,0 @@
Index: src/frontends/qt4/GuiDocument.cpp
===================================================================
--- src/frontends/qt4/GuiDocument.cpp (revision b4d885ac6968df4a705d395069ea2310f10c122b)
+++ src/frontends/qt4/GuiDocument.cpp (revision 1a4404944bf5830164435b0dedb6f6bee9c7371b)
@@ -69,9 +69,10 @@
#include <QAbstractItemModel>
-#include <QHeaderView>
+#include <QButtonGroup>
#include <QColor>
#include <QColorDialog>
#include <QCloseEvent>
#include <QFontDatabase>
+#include <QHeaderView>
#include <QScrollBar>
#include <QTextBoundaryFinder>

3
lyx-2.3.0.tar.xz
View File

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

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

Binary file not shown.

3
lyx-2.3.1-2.tar.xz Normal file
View File

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

BIN
lyx-2.3.1-2.tar.xz.sig Normal file
View File

Binary file not shown.

39
lyx.changes
View File

@@ -1,3 +1,42 @@
-------------------------------------------------------------------
Sat Sep 8 19:34:26 UTC 2018 - Cor Blom <cornelis@solcon.nl>
- Again updated release tarballs (hopefully these are the final ones)
-------------------------------------------------------------------
Wed Aug 29 22:05:25 UTC 2018 - cornelis@solcon.nl
- Add correct-shebang.patch to satisfy rpmlint
- Switch to python3
-------------------------------------------------------------------
Tue Aug 28 20:20:14 UTC 2018 - cornelis@solcon.nl
- Updated tarballs
-------------------------------------------------------------------
Tue Aug 28 19:37:33 UTC 2018 - cornelis@solcon.nl
- Install bash-completion in the right directory (as indicated by
rpmlint.
-------------------------------------------------------------------
Mon Aug 27 20:33:13 UTC 2018 - cornelis@solcon.nl
- Update to 2.3.1:
Most important changes:
* Overhaul the document painting mechanism. Now the screen is updated
asyncronously (as all normal applications do), which makes LyX
snappier, especially on repeated events. As an added bonus, subpixel
aliasing is honored in the work area.
* All python scripts distributed with LyX should now be compatible with both
python 2.x and python 3.x.
* Native filedialogs
* TEX2LYX IMPROVEMENTS: support for biblatex, chapterbib, \includeonly,
and better quotationmark detection.
* For other improvements and bugfixes, see the included ANNOUNCE file.
- Dropped fix-build-with-Qt5.11.patch, is part of this release
-------------------------------------------------------------------
Tue Jun 5 12:58:58 UTC 2018 - wbauer@tmo.at

21
lyx.spec
View File

@@ -17,18 +17,21 @@
Name: lyx
Version: 2.3.0
Version: 2.3.1
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/
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}-2.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 fix-build-with-Qt5.11.patch -- fixes compilation with Qt 5.11
Patch: fix-build-with-Qt5.11.patch
Source3: ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/lyx-%{version}-2.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
@@ -39,7 +42,7 @@ BuildRequires: file-devel
BuildRequires: hicolor-icon-theme
BuildRequires: hunspell-devel
BuildRequires: pkgconfig
BuildRequires: python
BuildRequires: python3
BuildRequires: update-desktop-files
BuildRequires: zlib-devel
Requires: ImageMagick
@@ -114,7 +117,7 @@ document under "Help" on the menubar.
%prep
%setup -q
%patch -p0
%patch0 -p1
%build
#./autogen.sh
@@ -153,7 +156,7 @@ ln -s %{_datadir}/lyx/tex $RPM_BUILD_ROOT$TEXMF/tex/latex/lyx
install -p -D -m 0644 lib/appdata.xml %{buildroot}%{_datadir}/appdata/lyx.appdata.xml
install -p -D -m 0644 lib/scripts/bash_completion %{buildroot}%{_sysconfdir}/bash_completion.d/lyx
install -p -D -m 0644 lib/scripts/bash_completion %{buildroot}%{_datadir}/bash-completion/completions/lyx
%suse_update_desktop_file lyx Office WordProcessor
@@ -188,6 +191,6 @@ install -p -D -m 0644 lib/scripts/bash_completion %{buildroot}%{_sysconfdir}/bas
%{_mandir}/man1/lyx.1%{ext_man}
%{_mandir}/man1/lyxclient.1%{ext_man}
%{_mandir}/man1/tex2lyx.1%{ext_man}
%{_sysconfdir}/bash_completion.d/lyx
%{_datadir}/bash-completion/completions/lyx
%changelog