commit gnuplot for openSUSE:Factory
Hello community,
here is the log from the commit of package gnuplot for openSUSE:Factory checked in at 2012-06-01 07:20:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnuplot (Old)
and /work/SRC/openSUSE:Factory/.gnuplot.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnuplot", Maintainer is "werner@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/gnuplot/gnuplot.changes 2012-04-12 09:24:54.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.gnuplot.new/gnuplot.changes 2012-06-01 07:20:16.000000000 +0200
@@ -1,0 +2,8 @@
+Wed May 30 15:33:29 UTC 2012 - jengelh@inai.de
+
+- Remove redundant tags/sections from specfile
+- Parallel build with %_smp_mflags
+- Add patch to delete no-longer supported constructs from
+ configure.in/Makefile.am
+
+-------------------------------------------------------------------
New:
----
gnuplot-automake.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnuplot.spec ++++++
--- /var/tmp/diff_new_pack.S9nWzL/_old 2012-06-01 07:20:18.000000000 +0200
+++ /var/tmp/diff_new_pack.S9nWzL/_new 2012-06-01 07:20:18.000000000 +0200
@@ -70,6 +70,7 @@
Patch2: gnuplot-4.6.0-fonts.diff
Patch4: gnuplot-4.6.0-demo.diff
Patch6: gnuplot-4.6.0-fix-format-errors.diff
+Patch7: gnuplot-automake.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)}
%if "%_exec_prefix" == "/usr/X11R6"
@@ -116,7 +117,7 @@
%{name} documentation files including the man and info pages
%prep
-%setup -q -n gnuplot-%{version}
+%setup -q
bunzip2 -dc %{_sourcedir}/gnuplot-fr.doc.bz2 > docs/gnuplot-fr.doc
test $? -eq 0 || exit 1
%patch1 -p 0 -b .x11ovf
@@ -124,6 +125,7 @@
%patch4 -p 0 -b .demo
%patch6 -p 0 -b .formaterrors
%patch0 -p 0 -b .0
+%patch -P 7 -p1
%build
SECSVGA="-DSVGA_IS_SECURE=1"
@@ -137,12 +139,8 @@
test -e $f || continue
mv $f $f.bak
done
-%if 0%{?suse_version} >= 1110
- touch configure.in
- rm -f config.status config.log config.cache configure aclocal.m4
- aclocal -I m4
- autoconf
-%endif
+
+ autoreconf -fi
%configure \
--with-gcc \
--with-x \
@@ -171,9 +169,9 @@
--with-plot=%{_libdir} \
--enable-qt
%if %suse_version <= 1140
- make %{?jobs:-j%jobs} RCC=/usr/bin/rcc LRELEASE=/usr/bin/lrelease
+ make %{?_smp_mflags} RCC=/usr/bin/rcc LRELEASE=/usr/bin/lrelease
%else
- make %{?jobs:-j%jobs}
+ make %{?_smp_mflags}
%endif
pushd docs/
make srcdir=. clean all html pdf gpcard.ps
@@ -217,9 +215,6 @@
rm -f %{buildroot}/%{_docdir}/gnuplot/demo/Makefile*
rm -f %{buildroot}/%{_datadir}/emacs/site-lisp/info-look.*
-%clean
- rm -rf %{buildroot}
-
%post doc
%install_info --info-dir=.%{_infodir} .%{_infodir}/%{name}.info.gz
++++++ gnuplot-automake.diff ++++++
From: Jan Engelhardt
participants (1)
-
root@hilbert.suse.de