Hello community,
here is the log from the commit of package texmaker for openSUSE:Factory
checked in at 2015-08-15 11:39:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texmaker (Old)
and /work/SRC/openSUSE:Factory/.texmaker.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texmaker"
Changes:
--------
--- /work/SRC/openSUSE:Factory/texmaker/texmaker.changes 2015-05-02
21:38:01.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.texmaker.new/texmaker.changes 2015-08-15
11:39:52.000000000 +0200
@@ -1,0 +2,6 @@
+Sat Aug 15 04:46:52 UTC 2015 - badshah...@gmail.com
+
+- Build against qt4 for openSUSE:42 (old poppler in openSUSE:42
+ does not support qt5 bindings).
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texmaker.spec ++++++
--- /var/tmp/diff_new_pack.b9SXtD/_old 2015-08-15 11:39:53.000000000 +0200
+++ /var/tmp/diff_new_pack.b9SXtD/_new 2015-08-15 11:39:53.000000000 +0200
@@ -27,8 +27,14 @@
# PATCH-FIX-UPSTREAM texmaker-correct-doc-location.patch badshah...@gmail.com
-- Handle doc files in the spec file rather than placing them in %%{_datadir}
during compilation
Patch1: texmaker-correct-doc-location.patch
BuildRequires: fdupes
-BuildRequires: libpoppler-qt5-devel
BuildRequires: update-desktop-files
+%if 0%{?suse_version} == 1315
+BuildRequires: libQtWebKit-devel
+BuildRequires: libpoppler-qt4-devel >= 0.16
+BuildRequires: libqt4-devel >= 4.6.1
+Requires: libQtWebKit4 >= 4.6.1
+%else
+BuildRequires: libpoppler-qt5-devel
BuildRequires: pkgconfig(Qt5Concurrent)
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Gui)
@@ -38,6 +44,7 @@
BuildRequires: pkgconfig(Qt5WebKit)
BuildRequires: pkgconfig(Qt5WebKitWidgets)
BuildRequires: pkgconfig(Qt5Xml)
+%endif
Requires: hunspell
Requires: texlive-latex
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -53,13 +60,22 @@
%patch1 -p1
%build
+%if 0%{?suse_version} == 1315
+QTDIR=%{_libdir}/qt4
+%else
QTDIR=%{_libdir}/qt5
+%endif
+
PATH=$QTDIR/bin:$PATH
LD_LIBRARY_PATH=$QTDIR/lib:$LD_LIBRARY_PATH
DYLD_LIBRARY_PATH=$QTDIR/lib:$DYLD_LIBRARY_PATH
export QTDIR PATH LD_LIBRARY_PATH DYLD_LIBRARY_PATH
PREFIX=%{buildroot}%{_prefix}
+%if 0%{?suse_version} == 1315
+qmake QMAKE_CXXFLAGS="%optflags -fvisibility=hidden
-fvisibility-inlines-hidden" -unix texmaker.pro
+%else
qmake-qt5 QMAKE_CXXFLAGS="%optflags -fvisibility=hidden
-fvisibility-inlines-hidden" -unix texmaker.pro
+%endif
make %{?_smp_mflags} INSTALL_ROOT=%{buildroot}
%install
