Accepting request 323255 from Publishing

1

OBS-URL: https://build.opensuse.org/request/show/323255
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/texmaker?expand=0&rev=40
This commit is contained in:
Dominique Leuenberger 2015-08-15 09:39:51 +00:00 committed by Git OBS Bridge
commit e730226938
2 changed files with 23 additions and 1 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Aug 15 04:46:52 UTC 2015 - badshah400@gmail.com
- Build against qt4 for openSUSE:42 (old poppler in openSUSE:42
does not support qt5 bindings).
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Apr 29 04:59:16 UTC 2015 - crrodriguez@opensuse.org Wed Apr 29 04:59:16 UTC 2015 - crrodriguez@opensuse.org

View File

@ -27,8 +27,14 @@ Source: http://www.xm1math.net/texmaker/texmaker-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM texmaker-correct-doc-location.patch badshah400@gmail.com -- Handle doc files in the spec file rather than placing them in %%{_datadir} during compilation # PATCH-FIX-UPSTREAM texmaker-correct-doc-location.patch badshah400@gmail.com -- Handle doc files in the spec file rather than placing them in %%{_datadir} during compilation
Patch1: texmaker-correct-doc-location.patch Patch1: texmaker-correct-doc-location.patch
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: libpoppler-qt5-devel
BuildRequires: update-desktop-files 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(Qt5Concurrent)
BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Gui)
@ -38,6 +44,7 @@ BuildRequires: pkgconfig(Qt5Script)
BuildRequires: pkgconfig(Qt5WebKit) BuildRequires: pkgconfig(Qt5WebKit)
BuildRequires: pkgconfig(Qt5WebKitWidgets) BuildRequires: pkgconfig(Qt5WebKitWidgets)
BuildRequires: pkgconfig(Qt5Xml) BuildRequires: pkgconfig(Qt5Xml)
%endif
Requires: hunspell Requires: hunspell
Requires: texlive-latex Requires: texlive-latex
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -53,13 +60,22 @@ under the GPL license .
%patch1 -p1 %patch1 -p1
%build %build
%if 0%{?suse_version} == 1315
QTDIR=%{_libdir}/qt4
%else
QTDIR=%{_libdir}/qt5 QTDIR=%{_libdir}/qt5
%endif
PATH=$QTDIR/bin:$PATH PATH=$QTDIR/bin:$PATH
LD_LIBRARY_PATH=$QTDIR/lib:$LD_LIBRARY_PATH LD_LIBRARY_PATH=$QTDIR/lib:$LD_LIBRARY_PATH
DYLD_LIBRARY_PATH=$QTDIR/lib:$DYLD_LIBRARY_PATH DYLD_LIBRARY_PATH=$QTDIR/lib:$DYLD_LIBRARY_PATH
export QTDIR PATH LD_LIBRARY_PATH DYLD_LIBRARY_PATH export QTDIR PATH LD_LIBRARY_PATH DYLD_LIBRARY_PATH
PREFIX=%{buildroot}%{_prefix} 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 qmake-qt5 QMAKE_CXXFLAGS="%optflags -fvisibility=hidden -fvisibility-inlines-hidden" -unix texmaker.pro
%endif
make %{?_smp_mflags} INSTALL_ROOT=%{buildroot} make %{?_smp_mflags} INSTALL_ROOT=%{buildroot}
%install %install