From 6dfd43c847f732a53e5b4970e144a58183263d47ede916351cbe0a22bfcc03ad Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Wed, 30 May 2012 16:26:21 +0000 Subject: [PATCH] Accepting request 122937 from home:jengelh:branches:am am 1.12 - http://lists.opensuse.org/opensuse-factory/2012-05/msg00752.html - Remove redundant tags/sections from specfile - Parallel build with %_smp_mflags - Add patch to delete no-longer supported constructs from configure.in/Makefile.am OBS-URL: https://build.opensuse.org/request/show/122937 OBS-URL: https://build.opensuse.org/package/show/Publishing/gnuplot?expand=0&rev=36 --- gnuplot-automake.diff | 61 +++++++++++++++++++++++++++++++++++++++++++ gnuplot.changes | 8 ++++++ gnuplot.spec | 19 +++++--------- 3 files changed, 76 insertions(+), 12 deletions(-) create mode 100644 gnuplot-automake.diff diff --git a/gnuplot-automake.diff b/gnuplot-automake.diff new file mode 100644 index 0000000..d2cbb75 --- /dev/null +++ b/gnuplot-automake.diff @@ -0,0 +1,61 @@ +From: Jan Engelhardt +Date: 2012-05-30 17:27:56.732814252 +0200 + +Rip out obsolete constructs. + +--- + Makefile.am | 1 - + configure.in | 3 +-- + src/Makefile.am | 3 +-- + 3 files changed, 2 insertions(+), 5 deletions(-) + +Index: gnuplot-4.6.0/Makefile.am +=================================================================== +--- gnuplot-4.6.0.orig/Makefile.am ++++ gnuplot-4.6.0/Makefile.am +@@ -1,5 +1,4 @@ + ## Process this file with automake to produce Makefile.in -*-Makefile-*- +-AUTOMAKE_OPTIONS = foreign 1.2h + + SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share + +Index: gnuplot-4.6.0/configure.in +=================================================================== +--- gnuplot-4.6.0.orig/configure.in ++++ gnuplot-4.6.0/configure.in +@@ -10,7 +10,7 @@ AC_INIT(gnuplot, 4.6.0) + AC_CONFIG_SRCDIR(src/graphics.c) + AC_PREREQ(2.58) + AM_CONFIG_HEADER(config.h:config.hin) +-AM_INIT_AUTOMAKE(1.7.9) ++AM_INIT_AUTOMAKE([foreign 1.7.9]) + + AM_MAINTAINER_MODE + +@@ -24,7 +24,6 @@ dnl Check for ANSI C prototypes, the con + dnl and ANSI style stringification + AC_GNU_SOURCE + AC_PROG_CC +-AM_C_PROTOTYPES + AC_PROG_CPP + AC_C_CONST + AC_C_INLINE +Index: gnuplot-4.6.0/src/Makefile.am +=================================================================== +--- gnuplot-4.6.0.orig/src/Makefile.am ++++ gnuplot-4.6.0/src/Makefile.am +@@ -1,5 +1,4 @@ + ## Process this file with automake to produce Makefile.in -*-Makefile-*- +-AUTOMAKE_OPTIONS = ansi2knr foreign 1.2h + + # in the spirit of automake ... + pkglibexecdir = $(libexecdir)/@PACKAGE@/@VERSION_MAJOR@ +@@ -40,7 +39,7 @@ binonly: $(bin_PROGRAMS) + transform = @program_transform_name@ + GNUPLOT_X11 = `echo gnuplot_x11 | sed '$(transform)'`$(EXEEXT) + +-AM_CPPFLAGS = -I../term -I$(top_srcdir)/term -DBINDIR=\"$(bindir)\" -DX11_DRIVER_DIR=\"$(X11_DRIVER_DIR)\" -DQT_DRIVER_DIR=\"$(QT_DRIVER_DIR)\" -DGNUPLOT_SHARE_DIR=\"$(GNUPLOT_SHARE_DIR)\" -DGNUPLOT_PS_DIR=\"$(GNUPLOT_PS_DIR)\" -DGNUPLOT_JS_DIR=\"$(GNUPLOT_JS_DIR)\" -DGNUPLOT_LUA_DIR=\"$(GNUPLOT_LUA_DIR)\" -DCONTACT=\"$(EMAIL)\" -DHELPFILE=\"$(HELPFILE)\" -DGNUPLOT_X11=\"$(GNUPLOT_X11)\" -DXAPPLRESDIR=\"$(XAPPLRESDIR)\" ++AM_CPPFLAGS = -DPROTOTYPES -I../term -I$(top_srcdir)/term -DBINDIR=\"$(bindir)\" -DX11_DRIVER_DIR=\"$(X11_DRIVER_DIR)\" -DQT_DRIVER_DIR=\"$(QT_DRIVER_DIR)\" -DGNUPLOT_SHARE_DIR=\"$(GNUPLOT_SHARE_DIR)\" -DGNUPLOT_PS_DIR=\"$(GNUPLOT_PS_DIR)\" -DGNUPLOT_JS_DIR=\"$(GNUPLOT_JS_DIR)\" -DGNUPLOT_LUA_DIR=\"$(GNUPLOT_LUA_DIR)\" -DCONTACT=\"$(EMAIL)\" -DHELPFILE=\"$(HELPFILE)\" -DGNUPLOT_X11=\"$(GNUPLOT_X11)\" -DXAPPLRESDIR=\"$(XAPPLRESDIR)\" + + gnuplot_SOURCES = alloc.c alloc.h ansichek.h axis.c axis.h binary.c \ + breaders.c breaders.h bitmap.h color.c color.h command.c \ diff --git a/gnuplot.changes b/gnuplot.changes index 54cb302..08fd706 100644 --- a/gnuplot.changes +++ b/gnuplot.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +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 + ------------------------------------------------------------------- Wed Apr 4 12:13:24 UTC 2012 - werner@suse.de diff --git a/gnuplot.spec b/gnuplot.spec index 999c7f6..f9395e2 100644 --- a/gnuplot.spec +++ b/gnuplot.spec @@ -70,6 +70,7 @@ Patch1: gnuplot-4.4.0-x11ovf.dif 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 @@ and can easily be extended to include new devices. %{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 @@ test $? -eq 0 || exit 1 %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 $? -eq 0 || exit 1 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 @@ test $? -eq 0 || exit 1 --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 @@ test $? -eq 0 || exit 1 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