- Improved spec file a bit
OBS-URL: https://build.opensuse.org/package/show/Publishing/lyx?expand=0&rev=169
This commit is contained in:
parent
12391ec1b4
commit
7de93b19a3
@ -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 {
|
|
||||||
|
|
@ -6,6 +6,7 @@ Tue Jun 25 18:39:19 UTC 2019 - Cor Blom <cornelis@solcon.nl>
|
|||||||
not really bugfixes. The many details can be found here:
|
not really bugfixes. The many details can be found here:
|
||||||
https://www.lyx.org/announce/2_3_3.txt
|
https://www.lyx.org/announce/2_3_3.txt
|
||||||
- Removed upstream patch: fix_boost_169.patch
|
- 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>
|
Fri Mar 15 13:49:18 UTC 2019 - Cor Blom <cornelis@solcon.nl>
|
||||||
|
18
lyx.spec
18
lyx.spec
@ -22,7 +22,7 @@ Release: 0
|
|||||||
Summary: WYSIWYM (What You See Is What You Mean) document processor
|
Summary: WYSIWYM (What You See Is What You Mean) document processor
|
||||||
License: GPL-2.0-or-later
|
License: GPL-2.0-or-later
|
||||||
Group: Productivity/Publishing/TeX/Frontends
|
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
|
Source: ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/lyx-%{version}.tar.xz
|
||||||
Source1: lyxrc.dist
|
Source1: lyxrc.dist
|
||||||
Source2: lyx.keyring
|
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
|
# 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
|
# python2 and 3 we follow and switch to python3
|
||||||
Patch0: correct-shebang.patch
|
Patch0: correct-shebang.patch
|
||||||
#!BuildIgnore: lyx
|
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
BuildRequires: bc
|
BuildRequires: bc
|
||||||
@ -41,14 +40,11 @@ BuildRequires: fdupes
|
|||||||
BuildRequires: file-devel
|
BuildRequires: file-devel
|
||||||
BuildRequires: hicolor-icon-theme
|
BuildRequires: hicolor-icon-theme
|
||||||
BuildRequires: hunspell-devel
|
BuildRequires: hunspell-devel
|
||||||
|
BuildRequires: libboost_headers-devel
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
BuildRequires: python3
|
BuildRequires: python3
|
||||||
BuildRequires: update-desktop-files
|
BuildRequires: update-desktop-files
|
||||||
BuildRequires: zlib-devel
|
BuildRequires: zlib-devel
|
||||||
Requires: ImageMagick
|
|
||||||
Requires: ghostscript
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
|
||||||
BuildRequires: libboost_headers-devel
|
|
||||||
BuildRequires: pkgconfig(Qt5Concurrent)
|
BuildRequires: pkgconfig(Qt5Concurrent)
|
||||||
BuildRequires: pkgconfig(Qt5Core)
|
BuildRequires: pkgconfig(Qt5Core)
|
||||||
BuildRequires: pkgconfig(Qt5DBus)
|
BuildRequires: pkgconfig(Qt5DBus)
|
||||||
@ -59,6 +55,9 @@ BuildRequires: pkgconfig(Qt5Sql)
|
|||||||
BuildRequires: pkgconfig(Qt5Svg)
|
BuildRequires: pkgconfig(Qt5Svg)
|
||||||
BuildRequires: pkgconfig(Qt5Widgets)
|
BuildRequires: pkgconfig(Qt5Widgets)
|
||||||
BuildRequires: pkgconfig(Qt5Xml)
|
BuildRequires: pkgconfig(Qt5Xml)
|
||||||
|
#!BuildIgnore: lyx
|
||||||
|
Requires: ImageMagick
|
||||||
|
Requires: ghostscript
|
||||||
# Goal is to require/recommends (roughly) everything that is supported in the GUI of LyX
|
# 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
|
# 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
|
# 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
|
%icon_theme_cache_postun
|
||||||
|
|
||||||
%files -f %{name}.lang
|
%files -f %{name}.lang
|
||||||
%defattr(-,root,root)
|
|
||||||
%docdir %{_datadir}/lyx/doc
|
%docdir %{_datadir}/lyx/doc
|
||||||
%doc %{_defaultdocdir}/lyx
|
%doc %{_defaultdocdir}/lyx
|
||||||
%{_bindir}/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
|
%dir %{_datadir}/texmf/tex/latex
|
||||||
%{_datadir}/texmf/tex/latex/lyx
|
%{_datadir}/texmf/tex/latex/lyx
|
||||||
%{_datadir}/lyx
|
%{_datadir}/lyx
|
||||||
%{_mandir}/man1/lyx.1%{ext_man}
|
%{_mandir}/man1/lyx.1%{?ext_man}
|
||||||
%{_mandir}/man1/lyxclient.1%{ext_man}
|
%{_mandir}/man1/lyxclient.1%{?ext_man}
|
||||||
%{_mandir}/man1/tex2lyx.1%{ext_man}
|
%{_mandir}/man1/tex2lyx.1%{?ext_man}
|
||||||
%{_datadir}/bash-completion/completions/lyx
|
%{_datadir}/bash-completion/completions/lyx
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
Loading…
Reference in New Issue
Block a user