From 71f4391fedbde4d14726e65d3772a50189003b6cf30b19f0a4c9b309312d5f7f Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Tue, 3 Feb 2015 14:01:19 +0000 Subject: [PATCH] Accepting request 283557 from home:ealin:varia - for versions greater than 13.1 we shall build against qt5 * cleaned up various rpmlint warning * got rid of configure options obsoleted OBS-URL: https://build.opensuse.org/request/show/283557 OBS-URL: https://build.opensuse.org/package/show/Publishing/gnuplot?expand=0&rev=61 --- gnuplot.changes | 7 +++++ gnuplot.spec | 74 ++++++++++++++++++++++++++++--------------------- 2 files changed, 49 insertions(+), 32 deletions(-) diff --git a/gnuplot.changes b/gnuplot.changes index 594f7c4..0ca4d78 100644 --- a/gnuplot.changes +++ b/gnuplot.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Jan 31 12:54:31 UTC 2015 - alinm.elena@gmail.com + +- for versions greater than 13.1 we shall build against qt5 + * cleaned up various rpmlint warning + * got rid of configure options obsoleted + ------------------------------------------------------------------- Wed Jan 21 07:29:58 UTC 2015 - burnus@net-b.de diff --git a/gnuplot.spec b/gnuplot.spec index 6e3c2c1..c4326fe 100644 --- a/gnuplot.spec +++ b/gnuplot.spec @@ -1,7 +1,7 @@ # # spec file for package gnuplot # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,11 @@ %bcond_without h3d_gridbox - +%if %{suse_version} > 1310 +%define qtver 5 +%else +%define qtver 4 +%endif Name: gnuplot BuildRequires: ImageMagick BuildRequires: automake @@ -28,17 +32,24 @@ BuildRequires: gcc-c++ BuildRequires: gd-devel BuildRequires: gtk2-devel BuildRequires: libjpeg-devel -BuildRequires: libqt4-devel >= 4.5 +BuildRequires: libqt5-linguist-devel BuildRequires: netpbm BuildRequires: pango-devel BuildRequires: readline-devel -%if %suse_version <= 1140 -BuildRequires: zziplib -%endif +%if %qtver >= 5 +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Network) +BuildRequires: pkgconfig(Qt5PrintSupport) +BuildRequires: pkgconfig(Qt5Svg) +%else +BuildRequires: libqt4-devel >= 4.5 +%endif BuildRequires: latex2html BuildRequires: texlive-latex BuildRequires: texlive-tex4ht BuildRequires: texlive-ucs +BuildRequires: zziplib %if %suse_version >= 1220 BuildRequires: makeinfo %endif @@ -51,24 +62,17 @@ BuildRequires: tex(fancyhdr.sty) BuildRequires: tex(pdftex.def) BuildRequires: tex(subfigure.sty) %endif -BuildRequires: xorg-x11 -BuildRequires: xorg-x11-devel -%if %suse_version > 1130 -BuildRequires: wxWidgets-devel -%else -BuildRequires: wxGTK-devel -%endif +BuildRequires: fdupes BuildRequires: libpng-devel BuildRequires: lua-devel -%if 0%{?suse_version} > 1110 BuildRequires: plotutils-devel -%else -BuildRequires: plotutils -%endif +BuildRequires: wxWidgets-devel +BuildRequires: xorg-x11 +BuildRequires: xorg-x11-devel Url: http://www.gnuplot.info/ Version: 5.0.0 Release: 0 -Summary: GNUplot a Function Plotting Utility +Summary: Function Plotting Utility and more License: SUSE-Gnuplot and GPL-2.0+ Group: Productivity/Graphics/Visualization/Graph # http://sourceforge.net/projects/gnuplot/files/gnuplot/4.6.4/gnuplot-4.6.4.tar.gz/download @@ -102,10 +106,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _x11inc %{_includedir} %define _appdef %{_x11data}/app-defaults %endif -%if %suse_version > 1130 %define _use_internal_dependency_generator 0 %define __find_requires %wx_requires -%endif %description GNUplot is a command line driven interactive function plotting utility. @@ -119,9 +121,7 @@ Group: Productivity/Graphics/Visualization/Graph Requires: %{name} Requires(post): %install_info_prereq Requires(postun): %install_info_prereq -%if 0%{?suse_version} >= 1120 BuildArch: noarch -%endif %description doc GNUplot documentation files including the man and info pages. GNUplot @@ -144,6 +144,7 @@ cp %{_sourcedir}/picins.sty docs %patch1 -p 0 -b .x11ovf %build + SECSVGA="-DSVGA_IS_SECURE=1" export CPPFLAGS="-I%{_x11inc} -I%{_includedir}/gd -DAppDefDir=\\\"%{_appdef}\\\"" export CPPFLAGS="$CPPFLAGS -DGNUPLOT_LIB_DEFAULT=\\\"%{_docdir}/%{name}/demo\\\"" @@ -157,8 +158,17 @@ cp %{_sourcedir}/picins.sty docs done autoreconf -fi - %configure \ - --with-gcc \ +# sed -i "s;bin/uic;bin/uic-qt5;g" ./configure +# sed -i "s;bin/moc;bin/moc-qt5;g" ./configure +# sed -i "s;bin/rcc;bin/rcc-qt5;g" ./configure +# sed -i "s;bin/lrelease;bin/lrelease-qt5;g" ./configure +# sed -i "s;UIC=uic;UIC=uic-qt5;g" ./configure +# sed -i "s;MOC=moc;MOC=moc-qt5;g" ./configure +# sed -i "s;RCC=rcc;RCC=rcc-qt5;g" ./configure +# sed -i "s;LRELEASE=lrelease;LRELEASE=lrelease-qt5;g" ./configure + + %configure \ + --enable-stats \ --with-x \ --x-includes=%{_x11inc} \ --x-libraries=%{_x11lib}\ @@ -177,19 +187,18 @@ cp %{_sourcedir}/picins.sty docs --enable-h3d-gridbox \ %endif --enable-backwards-compatibility\ - --with-zlib \ --with-gd \ - --enable-thin-splines \ --without-row-help \ --with-kpsexpand \ - --with-plot=%{_libdir} \ - --enable-qt -%if %suse_version <= 1140 - make %{?_smp_mflags} RCC=/usr/bin/rcc LRELEASE=/usr/bin/lrelease + --with-qt=qt%{qtver} + +%if %{qtver} >= 5 + make %{?_smp_mflags} UIC=/usr/bin/uic-qt5 MOC=/usr/bin/moc-qt5 RCC=/usr/bin/rcc-qt5 LRELEASE=/usr/bin/lrelease-qt5 %else - make %{?_smp_mflags} + make %{?_smp_mflags} %endif - pushd docs/ + + pushd docs/ make srcdir=. clean all html pdf gpcard.ps info pushd psdoc/ make srcdir=. clean pdf @@ -239,6 +248,7 @@ cp %{_sourcedir}/picins.sty docs install -m 0444 lisp/gnuplot*.el* %{buildroot}/%{_datadir}/emacs/site-lisp/ mv %{buildroot}/%{_mandir}/man1/gnuplot-ja.1 %{buildroot}/%{_mandir}/ja/man1/gnuplot.1 rm -f %{buildroot}/%{_docdir}/gnuplot/demo/Makefile* + %fdupes -s %{buildroot} %post doc %install_info --info-dir=.%{_infodir} .%{_infodir}/%{name}.info.gz