diff --git a/texstudio-2.9.0.tar.gz b/texstudio-2.9.0.tar.gz deleted file mode 100644 index f5b0342..0000000 --- a/texstudio-2.9.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e984ebc4393de13d9f20f474ce88382d587b2f8d0fb741f606a790a8f84a974a -size 25296387 diff --git a/texstudio-2.9.4.tar.gz b/texstudio-2.9.4.tar.gz new file mode 100644 index 0000000..0e95f87 --- /dev/null +++ b/texstudio-2.9.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc71590e3745ac193a640667737befd665d549e642e268eec7a8238d3b61b5ea +size 25292627 diff --git a/texstudio.changes b/texstudio.changes index c503cf8..89922bb 100644 --- a/texstudio.changes +++ b/texstudio.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Apr 30 18:39:07 UTC 2015 - dmitry_r@opensuse.org + +- Update to version 2.9.4 + * bugfix release, see included CHANGELOG.txt for details +- Build with Qt5 for openSUSE > 13.2 + ------------------------------------------------------------------- Sat Mar 14 17:37:04 UTC 2015 - dmitry_r@opensuse.org diff --git a/texstudio.spec b/texstudio.spec index 0adf201..ffccfcb 100644 --- a/texstudio.spec +++ b/texstudio.spec @@ -17,16 +17,28 @@ Name: texstudio -Version: 2.9.0 +Version: 2.9.4 Release: 0 Summary: LaTeX Editor License: GPL-2.0 Group: Productivity/Publishing/TeX/Frontends Url: http://texstudio.sf.net Source0: http://downloads.sourceforge.net/texstudio/%{name}-%{version}.tar.gz +BuildRequires: fdupes BuildRequires: hicolor-icon-theme +%if 0%{?suse_version} <= 1320 BuildRequires: libpoppler-qt4-devel BuildRequires: libqt4-devel +%else +BuildRequires: pkgconfig(Qt5Concurrent) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Network) +BuildRequires: pkgconfig(Qt5PrintSupport) +BuildRequires: pkgconfig(Qt5Script) +BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: pkgconfig(Qt5UiTools) +BuildRequires: pkgconfig(poppler-qt5) +%endif Requires: hunspell Requires: texlive-latex BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -41,14 +53,19 @@ syntax highlighting, automatically code completion and more. %setup -q -n %{name}%{version} %build -qmake CONFIG-=debug texstudio.pro +%if 0%{?suse_version} <= 1320 +qmake QMAKE_CXXFLAGS="%optflags -fno-strict-aliasing" CONFIG-=debug texstudio.pro +%else +qmake-qt5 QMAKE_CXXFLAGS="%optflags -fno-strict-aliasing" CONFIG-=debug texstudio.pro +%endif make %{?_smp_mflags} %install make INSTALL_ROOT=%{buildroot} install -rm -f %{buildroot}%{_datadir}texstudio/{AUTHORS,COPYING,CHANGELOG.txt} +rm -f %{buildroot}%{_datadir}/texstudio/{AUTHORS,COPYING,CHANGELOG.txt} +%fdupes -s %{buildroot}%{_datadir}/texstudio/ %files %defattr(-,root,root)