Hello community,
here is the log from the commit of package gnuplot for openSUSE:Factory checked
in at 2015-02-06 10:16:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnuplot (Old)
and /work/SRC/openSUSE:Factory/.gnuplot.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnuplot"
Changes:
--------
--- /work/SRC/openSUSE:Factory/gnuplot/gnuplot.changes 2015-01-25
21:14:38.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.gnuplot.new/gnuplot.changes 2015-02-06
10:16:34.000000000 +0100
@@ -1,0 +2,7 @@
+Sat Jan 31 12:54:31 UTC 2015 - alinm.el...@gmail.com
+
+- for versions greater than 13.1 we shall build against qt5
+ * cleaned up various rpmlint warning
+ * got rid of configure options obsoleted
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnuplot.spec ++++++
--- /var/tmp/diff_new_pack.EbDEUw/_old 2015-02-06 10:16:35.000000000 +0100
+++ /var/tmp/diff_new_pack.EbDEUw/_new 2015-02-06 10:16:35.000000000 +0100
@@ -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: 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
+%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(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 @@
%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 @@
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 @@
%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 @@
done
autoreconf -fi
+# 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 \
- --with-gcc \
+ --enable-stats \
--with-x \
--x-includes=%{_x11inc} \
--x-libraries=%{_x11lib}\
@@ -177,18 +187,17 @@
--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}
%endif
+
pushd docs/
make srcdir=. clean all html pdf gpcard.ps info
pushd psdoc/
@@ -239,6 +248,7 @@
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
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
