Accepting request 83561 from Publishing

more cleaning up of spec file

OBS-URL: https://build.opensuse.org/request/show/83561
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lyx?expand=0&rev=45
This commit is contained in:
Lars Vogdt 2011-09-19 15:54:45 +00:00 committed by Git OBS Bridge
commit faed00d102
2 changed files with 13 additions and 26 deletions

View File

@ -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 Thu Sep 8 10:00:37 UTC 2011 - cornelis@solcon.nl

View File

@ -15,18 +15,15 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
# norootforbuild
Name: lyx Name: lyx
#!BuildIgnore: 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+ License: LGPLv2.1+
Group: Productivity/Publishing/TeX/Frontends Group: Productivity/Publishing/TeX/Frontends
Requires: texlive-latex ImageMagick
AutoReqProv: on
Version: 2.0.1 Version: 2.0.1
Release: 3 Release: 4
Summary: LaTeX-Based WYSIWYG Editor Summary: LaTeX-Based WYSIWYG Editor
Url: http://www.lyx.org/ Url: http://www.lyx.org/
Source: ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/lyx-2.0.1.tar.gz 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 Patch0: lyx-2.0.1-xdg_open.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: texlive-latex ImageMagick
Recommends: texlive-xetex xindy Recommends: texlive-xetex xindy
%description %description
@ -58,32 +56,15 @@ sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" src/LyX.cpp
%build %build
#./autogen.sh #./autogen.sh
export CFLAGS="$RPM_OPT_FLAGS -DHAVE_STRERROR"
export CXXFLAGS="$RPM_OPT_FLAGS -DHAVE_STRERROR"
TEXMF=%{_datadir}/texmf TEXMF=%{_datadir}/texmf
%if %suse_version > 1020
TEXMF=$(kpsexpand '$TEXMFMAIN')
%if %suse_version > 1030
TEXMF=$(kpsexpand '$TEXMFDIST')
%endif
%endif
%configure \ %configure \
--without-included-boost \ --without-included-boost \
%if %suse_version < 1020
--with-extra-inc=/usr/X11R6/include/X11 \
%endif
--with-aspell --with-hunspell \ --with-aspell --with-hunspell \
--with-frontend=qt4 --with-frontend=qt4
make %{?jobs:-j%jobs} make %{?_smp_mflags}
%install %install
TEXMF=%{_datadir}/texmf 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 make install DESTDIR=$RPM_BUILD_ROOT TEXMF=$TEXMF
# some defaults # some defaults
@ -106,9 +87,6 @@ ln -s %{_datadir}/lyx/tex $RPM_BUILD_ROOT$TEXMF/tex/latex/lyx
%fdupes -s $RPM_BUILD_ROOT %fdupes -s $RPM_BUILD_ROOT
%find_lang %name %find_lang %name
%clean
rm -rf $RPM_BUILD_ROOT
%files -f %name.lang %files -f %name.lang
%defattr(-,root,root) %defattr(-,root,root)
%docdir %{_datadir}/lyx/doc %docdir %{_datadir}/lyx/doc
@ -118,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT
/usr/bin/tex2lyx /usr/bin/tex2lyx
%{_datadir}/applications/lyx.desktop %{_datadir}/applications/lyx.desktop
%{_datadir}/pixmaps/lyx.png %{_datadir}/pixmaps/lyx.png
%dir %{_datadir}/texmf
%dir %{_datadir}/texmf/tex
%dir %{_datadir}/texmf/tex/latex
%{_datadir}/texmf/tex/latex/lyx %{_datadir}/texmf/tex/latex/lyx
%{_datadir}/lyx %{_datadir}/lyx
%doc %{_mandir}/man1/lyx.1.gz %doc %{_mandir}/man1/lyx.1.gz