lyx: update to 2.3.0

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11711 ec354946-7b23-47d6-9f5a-488ba84defc7

l/lyx/lyx-vl.spec

@@ -1,36 +1,37 @@
+%define pkg_name    lyx
+%define pkg_version 2.3.0
+%define pkg_release 1%{?_dist_release}
+
 %define _fontdir %{_datadir}/fonts/%{name}
+%define texmf %{_datadir}/texmf
+%define build_texmf %{buildroot}%{texmf}
 
-%define texmf		%{_datadir}/texmf
-%define build_texmf	%{buildroot}%{texmf}
+%define exec_texhash [ -x %{_bindir}/texhash ] && PATH=%{_bindir}:$PATH %{_bindir}/texhash 2>/dev/null
 
-%define exec_texhash  [ -x %{_bindir}/texhash     ] && PATH=%{_bindir}:$PATH %{_bindir}/texhash 2>/dev/null
 
 Summary: WYSIWYM (What You See Is What You Mean) word processor with LaTeX output
 Summary(ja): LaTeX 形式で保存できるワードプロセッサ
-Name: lyx
-Version: 2.2.3
-Release: 1%{?_dist_release}
-License: GPLv2+
-Group: Applications/Editors
-URL: http://www.lyx.org/
-Source0: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.xz
+Name:    %{pkg_name}
+Version: %{pkg_version}
+Release: %{pkg_release}
+
+License: GPLv2 or GPLv3
+Group:   Applications/Editors
+URL:     http://www.lyx.org/
 
+Source0: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.xz
 Source1: lyxrc.dist
 Source10: lyx.desktop
 
 ## upstreamable patches
 # submitted, but upstream rejected it.  we currently agree to disagree.
 # Patch50: lyx-2.0.6-xdg_open.patch
-# Patch from Debian (testing)
-Patch50: lyx-2.2.3-xdg_open.patch
+Patch50: lyx-2.3.0-xdg_open.patch
 
 ## vine
 # reverted checkLatex to lyx-1.6.5
-Patch100: lyx-2.0.1-configurepy-vine.patch
-
+Patch100: lyx-2.3.0-configurepy-vine.patch
 
-# BuildRequires: aiksaurus-devel
-# BuildRequires:   aspell-devel
 BuildRequires:   enchant-devel
 BuildRequires:   hunspell-devel
 BuildRequires:   libboost-devel
@@ -41,7 +42,6 @@ BuildRequires:   desktop-file-utils
 BuildRequires:   gettext
 BuildRequires:   python
 BuildRequires:   xorg-x11-devel
-# BuildRequires:   qt4-devel
 BuildRequires:   qt5-qtbase-devel
 BuildRequires:   qt5-qtsvg-devel
 BuildRequires:   libpng-devel
@@ -49,18 +49,13 @@ BuildRequires:   glib2-devel
 BuildRequires:   zlib-devel
 BuildRequires:   bc
 
-Requires(post):  texlive-common
+Requires(post):   texlive-common
 Requires(postun): texlive-common
-Requires:        ghostscript
-Requires:        python
-
-# # optional minimal qt4 dep
-# %{?_qt_version:Requires: qt4 >= %{_qt4_version}}
-
-Requires:        %{name}-fonts = %{version}-%{release}
-
-Requires:        xdg-utils
-Requires:        rcs
+Requires: ghostscript
+Requires: python
+Requires: %{name}-fonts = %{version}-%{release}
+Requires: xdg-utils
+Requires: rcs
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -92,31 +87,28 @@ LaTeX形式で出力もできるワードプロセッサです。数式の入力
 特別な知識が無くても、最小限の努力でプロ並の出力を得られるように設計
 してあります。
 
-
 %package fonts
 Summary: Lyx/MathML fonts
 Group:   User Interface/X
 # The actual license says "The author of these fonts, Basil K. Malyshev, has
 # kindly granted permission to use and modify these fonts."
 # One of the font files (wasy10) is separately licensed GPL+.
-License: Copyright only and GPL+
-Obsoletes:       latex-xft-fonts
+License:   Copyright only and GPL+
+Obsoletes: latex-xft-fonts
 BuildArch: noarch
-%description  fonts
+
+%description fonts
 A collection of Math symbol fonts for %{name}.
 
 
 %prep
 %setup -q
 
-%patch50 -p1 -b .xdg_open
-%patch100 -p1 -b .vine
-
-#./autogen.sh
-
+%patch50 -b .xdg_open
+%patch100 -b .vine
 
 %build
-%configure \
+%{configure} \
     --disable-dependency-tracking \
     --disable-rpath \
     --enable-build-type=release \
@@ -124,31 +116,23 @@ A collection of Math symbol fonts for %{name}.
     --enable-optimization="%{optflags}" \
     --without-included-boost \
     --disable-stdlib-debug \
-    \
     --with-enchant \
     --with-hunspell \
     --enable-qt5 \
     ;
-    # --enable-shared \
-    # --disable-static \
-    # --with-frontend=qt4 \
-    # --without-aiksaurus \
-
-%__make %{?_smp_mflags}
 
-# # make sure all .gmo files are regenerated from .po files
-# (cd po; make update-gmo)
+%{__make} %{?_smp_mflags}
 
 %install
-%__rm -rf ${RPM_BUILD_ROOT}
-%__make DESTDIR=${RPM_BUILD_ROOT} install
+%{__rm} -rf ${RPM_BUILD_ROOT}
+%{__make} install DESTDIR=${RPM_BUILD_ROOT}
 
 # misc/extras
-%__install -p -m644 -D %{SOURCE1} %{buildroot}%{_datadir}/lyx/lyxrc.dist
+%{__install} -p -m644 -D %{SOURCE1} %{buildroot}%{_datadir}/lyx/lyxrc.dist
 
 # Set up the lyx-specific class files where TeX can see them
-%__mkdir_p %{build_texmf}/tex/latex
-%__mv %{buildroot}%{_datadir}/lyx/tex %{build_texmf}/tex/latex/lyx
+%{__mkdir_p} %{build_texmf}/tex/latex
+%{__mv} %{buildroot}%{_datadir}/lyx/tex %{build_texmf}/tex/latex/lyx
 
 # desktop & icon
 desktop-file-install --vendor="vine" \
@@ -156,25 +140,25 @@ desktop-file-install --vendor="vine" \
 %__install -p -D -m644 lib/images/lyx.png \
   %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/lyx.png
 
+%{__rm} -f ${RPM_BUILD_ROOT}%{_datadir}/applications/lyx.desktop
+
 # ghost'd files
 touch %{buildroot}%{_datadir}/lyx/lyxrc.defaults
 touch %{buildroot}%{_datadir}/lyx/{packages,textclass}.lst
 
 # fonts
-install -m 0755 -d %{buildroot}%{_fontdir}
-mv %{buildroot}%{_datadir}/lyx/fonts/*.ttf %{buildroot}%{_fontdir}/
-rm -rf %{buildroot}%{_datadir}/lyx/fonts
+%{__install} -m 0755 -d %{buildroot}%{_fontdir}
+%{__mv} %{buildroot}%{_datadir}/lyx/fonts/*.ttf %{buildroot}%{_fontdir}/
+%{__rm} -rf %{buildroot}%{_datadir}/lyx/fonts
 
 %find_lang %{name}
 
 %check
 # tests/test_filetools error bogus ( see http://bugzilla.redhat.com/723938 )
-%__make -k check ||:
-
+%{__make} -k check || :
 
 %clean
-%__rm -rf ${RPM_BUILD_ROOT}
-
+%{__rm} -rf ${RPM_BUILD_ROOT}
 
 %post
 touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
@@ -194,10 +178,10 @@ touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 %post fonts
-%__font_install_post %{_fontdir}
+%{__font_install_post} %{_fontdir}
 
 %postun fonts
-%__font_install_postun %{_fontdir}
+%{__font_install_postun} %{_fontdir}
 
 
 %files -f %{name}.lang
@@ -221,6 +205,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 
 %changelog
+* Fri Jun 08 2018 Toshiaki Ara <ara_t@384.jp> 2.3.0-1
+- update to 2.3.0
+- update Patch50 and Patch100
+
 * Mon Jan 08 2018 Toshiaki Ara <ara_t@384.jp> 2.2.3-1
 - new upstream release
 - update Patch50 (lyx-2.2.3-xdg_open.patch)