From 16df5f93fee73161020c537af2c5abedb64122dac0654985516b0928dac70fb3 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 9 Sep 2011 10:21:58 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/lyx revision 44.0 OBS-URL: https://build.opensuse.org/package/show/Publishing/lyx?expand=0&rev=dcf2dbb2f03ac4854c2cc309f5a14d1d --- lyx.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lyx.spec b/lyx.spec index 2a8214e..cd048b1 100644 --- a/lyx.spec +++ b/lyx.spec @@ -26,7 +26,7 @@ Group: Productivity/Publishing/TeX/Frontends Requires: texlive-latex ImageMagick AutoReqProv: on Version: 2.0.1 -Release: 1 +Release: 3 Summary: LaTeX-Based WYSIWYG Editor Url: http://www.lyx.org/ Source: ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/lyx-2.0.1.tar.gz From a0f4ef40156c05c1ad5c25fc446adc63b2bbbca766a5ae626ddf9dc40914db9e Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Mon, 19 Sep 2011 11:06:15 +0000 Subject: [PATCH 2/2] more cleaning up OBS-URL: https://build.opensuse.org/package/show/Publishing/lyx?expand=0&rev=35 --- lyx.changes | 6 ++++++ lyx.spec | 33 +++++++-------------------------- 2 files changed, 13 insertions(+), 26 deletions(-) diff --git a/lyx.changes b/lyx.changes index 7610d9a..c5f189a 100644 --- a/lyx.changes +++ b/lyx.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Sep 19 11:02:08 UTC 2011 - cornelis@solcon.nl + +- Cleaned up spec (removed some old stuff) +- Removed texlive-devel and texlive-latex from BuildRequires (not used at build time: LyX checks the LaTeX installation at first start up, or can be manually called by reconfigure in the menu) + ------------------------------------------------------------------- Thu Sep 8 10:00:37 UTC 2011 - cornelis@solcon.nl diff --git a/lyx.spec b/lyx.spec index cd048b1..3f2c0d7 100644 --- a/lyx.spec +++ b/lyx.spec @@ -15,18 +15,15 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: lyx #!BuildIgnore: lyx -BuildRequires: aspell-devel boost-devel fdupes hunspell-devel libqt4-devel python texlive-devel texlive-latex update-desktop-files +BuildRequires: aspell-devel boost-devel fdupes hunspell-devel libqt4-devel python update-desktop-files License: LGPLv2.1+ Group: Productivity/Publishing/TeX/Frontends -Requires: texlive-latex ImageMagick -AutoReqProv: on Version: 2.0.1 -Release: 3 +Release: 4 Summary: LaTeX-Based WYSIWYG Editor Url: http://www.lyx.org/ Source: ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/lyx-2.0.1.tar.gz @@ -38,6 +35,7 @@ Source3: lyxrc.dist Patch0: lyx-2.0.1-xdg_open.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires: texlive-latex ImageMagick Recommends: texlive-xetex xindy %description @@ -58,32 +56,15 @@ sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" src/LyX.cpp %build #./autogen.sh -export CFLAGS="$RPM_OPT_FLAGS -DHAVE_STRERROR" -export CXXFLAGS="$RPM_OPT_FLAGS -DHAVE_STRERROR" TEXMF=%{_datadir}/texmf -%if %suse_version > 1020 -TEXMF=$(kpsexpand '$TEXMFMAIN') -%if %suse_version > 1030 -TEXMF=$(kpsexpand '$TEXMFDIST') -%endif -%endif %configure \ --without-included-boost \ -%if %suse_version < 1020 - --with-extra-inc=/usr/X11R6/include/X11 \ -%endif --with-aspell --with-hunspell \ --with-frontend=qt4 -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %install TEXMF=%{_datadir}/texmf -%if %suse_version > 1020 -TEXMF=$(kpsexpand '$TEXMFMAIN') -%if %suse_version > 1030 -TEXMF=$(kpsexpand '$TEXMFDIST') -%endif -%endif make install DESTDIR=$RPM_BUILD_ROOT TEXMF=$TEXMF # some defaults @@ -106,9 +87,6 @@ ln -s %{_datadir}/lyx/tex $RPM_BUILD_ROOT$TEXMF/tex/latex/lyx %fdupes -s $RPM_BUILD_ROOT %find_lang %name -%clean -rm -rf $RPM_BUILD_ROOT - %files -f %name.lang %defattr(-,root,root) %docdir %{_datadir}/lyx/doc @@ -118,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT /usr/bin/tex2lyx %{_datadir}/applications/lyx.desktop %{_datadir}/pixmaps/lyx.png +%dir %{_datadir}/texmf +%dir %{_datadir}/texmf/tex +%dir %{_datadir}/texmf/tex/latex %{_datadir}/texmf/tex/latex/lyx %{_datadir}/lyx %doc %{_mandir}/man1/lyx.1.gz