diff --git a/lyx-2.1.2.2-remove-date-time.patch b/lyx-2.1.2.2-remove-date-time.patch new file mode 100644 index 0000000..e62321b --- /dev/null +++ b/lyx-2.1.2.2-remove-date-time.patch @@ -0,0 +1,49 @@ +From: Andreas Stieger +Date: Wed, 21 Jan 2015 13:02:32 +0000 +Subject: Remove __DATE__ and __TIME__ +Upstream: no +References: + +Fixes obs warning: +[ 796s] lyx.i586: W: file-contains-date-and-time /usr/bin/lyx +[ 796s] Your file uses __DATE and __TIME__ this causes the package to rebuild when +[ 796s] not needed + +Index: lyx-2.1.2.2/src/LyX.cpp +=================================================================== +--- lyx-2.1.2.2.orig/src/LyX.cpp ++++ lyx-2.1.2.2/src/LyX.cpp +@@ -1146,8 +1146,6 @@ int parse_version(string const &, string + { + cout << "LyX " << lyx_version + << " (" << lyx_release_date << ")" << endl; +- cout << to_utf8(bformat(_("Built on %1$s[[date]], %2$s[[time]]"), +- from_ascii(__DATE__), from_ascii(__TIME__))) << endl; + + cout << lyx_version_info << endl; + exit(0); +Index: lyx-2.1.2.2/src/frontends/qt4/GuiAbout.cpp +=================================================================== +--- lyx-2.1.2.2.orig/src/frontends/qt4/GuiAbout.cpp ++++ lyx-2.1.2.2/src/frontends/qt4/GuiAbout.cpp +@@ -138,8 +138,6 @@ static QString buildinfo() + QTextStream out(&res); + out << "LyX " << lyx_version + << " (" << lyx_release_date << ")" << endl; +- out << toqstr(bformat(_("Built on %1$s[[date]], %2$s[[time]]"), +- from_ascii(__DATE__), from_ascii(__TIME__))) << endl; + + out << lyx_version_info << endl; + return res; +Index: lyx-2.1.2.2/src/tex2lyx/tex2lyx.cpp +=================================================================== +--- lyx-2.1.2.2.orig/src/tex2lyx/tex2lyx.cpp ++++ lyx-2.1.2.2/src/tex2lyx/tex2lyx.cpp +@@ -565,7 +565,6 @@ int parse_version(string const &, string + { + lyxerr << "tex2lyx " << lyx_version + << " (" << lyx_release_date << ")" << endl; +- lyxerr << "Built on " << __DATE__ << ", " << __TIME__ << endl; + + lyxerr << lyx_version_info << endl; + exit(error_code); diff --git a/lyx-2.1.2.2.tar.xz b/lyx-2.1.2.2.tar.xz new file mode 100644 index 0000000..4a1b778 --- /dev/null +++ b/lyx-2.1.2.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2cedf5119d9b6360ba95205d8a641f882b0da200b9e765888f2545231e7fb052 +size 10650108 diff --git a/lyx-2.1.2.2.tar.xz.sig b/lyx-2.1.2.2.tar.xz.sig new file mode 100644 index 0000000..35a52d1 Binary files /dev/null and b/lyx-2.1.2.2.tar.xz.sig differ diff --git a/lyx-2.1.2.tar.xz b/lyx-2.1.2.tar.xz deleted file mode 100644 index 41de64d..0000000 --- a/lyx-2.1.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c8783822341e95cc2a6b5da1b0e838542fd875017d8775f237b17c1790b1bba5 -size 10669264 diff --git a/lyx.changes b/lyx.changes index 7e7c111..63c0ba3 100644 --- a/lyx.changes +++ b/lyx.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Wed Jan 21 15:21:50 UTC 2015 - andreas.stieger@gmx.de + +- LyX 2.1.2.2 (and 2.1.2.1): + * fixes for platforms other than GNU/Linux +- add upstream signing key and verify source signature +- Remove __DATE__ and __TIME__ from info dialogs to prevent + rebuilds, add lyx-2.1.2.2-remove-date-time.patch + +------------------------------------------------------------------- +Wed Jan 7 20:19:02 UTC 2015 - cornelis@solcon.nl + +- Added texlive-esint-type1 to recommends: needed to compile the user guide. + ------------------------------------------------------------------- Thu Sep 25 13:06:42 UTC 2014 - cornelis@solcon.nl diff --git a/lyx.keyring b/lyx.keyring new file mode 100644 index 0000000..c27e5e1 --- /dev/null +++ b/lyx.keyring @@ -0,0 +1,45 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: SKS 1.1.3 + +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 +=Av8Z +-----END PGP PUBLIC KEY BLOCK----- diff --git a/lyx.spec b/lyx.spec index 3afae6a..b790bef 100644 --- a/lyx.spec +++ b/lyx.spec @@ -1,7 +1,7 @@ # # spec file for package lyx # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,7 +28,7 @@ BuildRequires: libqt4-devel BuildRequires: python BuildRequires: update-desktop-files BuildRequires: xz -Version: 2.1.2 +Version: 2.1.2.2 Release: 0 Summary: WYSIWYM (What You See Is What You Mean) document processor License: GPL-2.0+ @@ -36,9 +36,12 @@ Group: Productivity/Publishing/TeX/Frontends Url: http://www.lyx.org/ Source: ftp://ftp.lyx.org/pub/lyx/stable/2.1.x/lyx-%{version}.tar.xz Source1: lyxrc.dist +Source2: lyx.keyring +Source3: ftp://ftp.lyx.org/pub/lyx/stable/2.1.x/lyx-%{version}.tar.xz.sig # xdg patch # This was rejected by upstream (http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg133878.html) Patch0: lyx-2.1.2-xdg_open.patch +Patch1: lyx-2.1.2.2-remove-date-time.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: ImageMagick %if 0%{?suse_version} < 1230 @@ -63,6 +66,7 @@ Recommends: texlive-collection-xetex Recommends: texlive-covington Recommends: texlive-endnotes Recommends: texlive-esint +Recommends: texlive-esint-type1 Recommends: texlive-fragments Recommends: texlive-ifsym Recommends: texlive-mathdots @@ -104,13 +108,7 @@ document under "Help" on the menubar. %prep %setup -q %patch0 -p1 -# Remove build time references so build-compare can do its work -FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M') -FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') -sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/" src/LyX.cpp -sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" src/LyX.cpp -sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/" src/tex2lyx/tex2lyx.cpp -sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" src/tex2lyx/tex2lyx.cpp +%patch1 -p1 %build #./autogen.sh