From 0b10da6744c03e5dcfda0bff1c7828f943bf5f8da4f016b11cd00d7c1ce054f4 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Tue, 3 Jul 2012 07:28:52 +0000
Subject: [PATCH] .

OBS-URL: https://build.opensuse.org/package/show/Publishing/gnuplot?expand=0&rev=38
---
 gnuplot-4.6.0-backtick.diff | 24 ++++++++++++++++++++++++
 gnuplot-4.6.0.dif           |  2 +-
 gnuplot.changes             |  5 +++++
 gnuplot.spec                |  4 +++-
 4 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 gnuplot-4.6.0-backtick.diff

diff --git a/gnuplot-4.6.0-backtick.diff b/gnuplot-4.6.0-backtick.diff
new file mode 100644
index 0000000..2bd579e
--- /dev/null
+++ b/gnuplot-4.6.0-backtick.diff
@@ -0,0 +1,24 @@
+--- lisp/gnuplot.el
++++ lisp/gnuplot.el	2012-07-02 14:46:33.000000000 +0000
+@@ -342,16 +342,16 @@
+     (if (fboundp 'defface)
+         nil
+       (defmacro defface (var values doc &rest args)
+-        (` (progn
+-             (defvar (, var) (quote (, var)))
++        `(progn
++             (defvar ,var (quote ,var))
+              ;; To make colors for your faces you need to set your .Xdefaults
+              ;; or set them up ahead of time in your .emacs file.
+-             (make-face (, var))
+-             ))))
++             (make-face ,var)
++             )))
+     (if (fboundp 'defcustom)
+         nil
+       (defmacro defcustom (var value doc &rest args)
+-        (` (defvar (, var) (, value) (, doc)))))))
++        `(defvar ,var ,value ,doc)))))
+ 
+ ;; (eval-and-compile
+ ;;   (condition-case ()
diff --git a/gnuplot-4.6.0.dif b/gnuplot-4.6.0.dif
index b6474fe..c7064ac 100644
--- a/gnuplot-4.6.0.dif
+++ b/gnuplot-4.6.0.dif
@@ -1,6 +1,6 @@
 --- configure.in
 +++ configure.in	2011-08-17 20:44:53.000000000 +0000
-@@ -329,7 +329,7 @@ if test "$with_linux_vga" = yes; then
+@@ -328,7 +328,7 @@ if test "$with_linux_vga" = yes; then
      [AC_DEFINE(LINUXVGA,1,
                 [ Define if this is a Linux system with SuperVGA library. ])
       LINUXSUID='chown root $(bindir)/gnuplot; chmod u+s $(bindir)/gnuplot'
diff --git a/gnuplot.changes b/gnuplot.changes
index 08fd706..cb40f58 100644
--- a/gnuplot.changes
+++ b/gnuplot.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jul  3 07:27:41 UTC 2012 - werner@suse.de
+
+- Convert gnuplot.el to new backtick lisp scheme for emacs 24.1
+
 -------------------------------------------------------------------
 Wed May 30 15:33:29 UTC 2012 - jengelh@inai.de
 
diff --git a/gnuplot.spec b/gnuplot.spec
index f9395e2..dba4d4e 100644
--- a/gnuplot.spec
+++ b/gnuplot.spec
@@ -71,6 +71,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
+Patch8:         gnuplot-4.6.0-backtick.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"
@@ -124,8 +125,9 @@ test $? -eq 0 || exit 1
 %patch2 -p 0 -b .font
 %patch4 -p 0 -b .demo
 %patch6 -p 0 -b .formaterrors
+%patch7 -p 1 -b .auto
+%patch8 -p 0 -b .btick
 %patch0 -p 0 -b .0
-%patch -P 7 -p1
 
 %build
     SECSVGA="-DSVGA_IS_SECURE=1"