Ver código fonte

lyx: update to 2.2.3

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11364 ec354946-7b23-47d6-9f5a-488ba84defc7
ara_t 6 anos atrás
pai
commit
1f2bcbb708
1 arquivos alterados com 27 adições e 11 exclusões
  1. 27 11
      l/lyx/lyx-vl.spec

+ 27 - 11
l/lyx/lyx-vl.spec

@@ -8,7 +8,7 @@
 Summary: WYSIWYM (What You See Is What You Mean) word processor with LaTeX output
 Summary(ja): LaTeX 形式で保存できるワードプロセッサ
 Name: lyx
-Version: 2.0.6
+Version: 2.2.3
 Release: 1%{?_dist_release}
 License: GPLv2+
 Group: Applications/Editors
@@ -20,7 +20,9 @@ Source10: lyx.desktop
 
 ## upstreamable patches
 # submitted, but upstream rejected it.  we currently agree to disagree.
-Patch50: lyx-2.0.6-xdg_open.patch
+# Patch50: lyx-2.0.6-xdg_open.patch
+# Patch from Debian (testing)
+Patch50: lyx-2.2.3-xdg_open.patch
 
 ## vine
 # reverted checkLatex to lyx-1.6.5
@@ -39,18 +41,21 @@ BuildRequires:   desktop-file-utils
 BuildRequires:   gettext
 BuildRequires:   python
 BuildRequires:   xorg-x11-devel
-BuildRequires:   qt4-devel
+# BuildRequires:   qt4-devel
+BuildRequires:   qt5-qtbase-devel
+BuildRequires:   qt5-qtsvg-devel
 BuildRequires:   libpng-devel
 BuildRequires:   glib2-devel
 BuildRequires:   zlib-devel
+BuildRequires:   bc
 
 Requires(post):  texlive-common
 Requires(postun): texlive-common
 Requires:        ghostscript
 Requires:        python
 
-# optional minimal qt4 dep
-%{?_qt_version:Requires: qt4 >= %{_qt4_version}}
+# # optional minimal qt4 dep
+# %{?_qt_version:Requires: qt4 >= %{_qt4_version}}
 
 Requires:        %{name}-fonts = %{version}-%{release}
 
@@ -119,20 +124,21 @@ A collection of Math symbol fonts for %{name}.
     --enable-optimization="%{optflags}" \
     --without-included-boost \
     --disable-stdlib-debug \
-    --enable-shared \
-    --disable-static \
     \
-    --with-frontend=qt4 \
-    --without-aiksaurus \
     --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)
 
-
 %install
 %__rm -rf ${RPM_BUILD_ROOT}
 %__make DESTDIR=${RPM_BUILD_ROOT} install
@@ -196,7 +202,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc ABOUT-NLS ANNOUNCE COPYING README UPGRADING NEWS lib/CREDITS
+%doc ANNOUNCE COPYING README UPGRADING NEWS lib/CREDITS
 %{_bindir}/*
 %{_datadir}/lyx/
 %{texmf}/tex/latex/lyx/
@@ -215,6 +221,16 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 
 %changelog
+* 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)
+- add BuildRequires: bc
+- use qt5 instead of qt4
+  - add --enable-qt5 option
+  - add BuildRequires: qt5-qtbase-devel, qt5-qtsvg-devel
+  - drop BuildRequires: qt4-devel
+- delete unused options
+
 * Sat Dec 28 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.0.6-1
 - update to 2.0.6
 - update Patch50 (lyx-2.0.6-xdg_open.patch)