From 667e3dca8c9304a1cbca310b74e9cb147355ddf3b1d2072fcd0ab66f4cf87b04 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Tue, 30 Nov 2010 08:55:11 +0000
Subject: [PATCH] Accepting request 54010 from home:dimstar:branches:GNOME:Apps

thanks

OBS-URL: https://build.opensuse.org/request/show/54010
OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/genius?expand=0&rev=11
---
 genius-1.0.11.tar.bz2 |  3 ---
 genius-1.0.12.tar.bz2 |  3 +++
 genius-make382.patch  | 24 ------------------------
 genius.changes        | 18 ++++++++++++++++++
 genius.spec           |  9 ++-------
 5 files changed, 23 insertions(+), 34 deletions(-)
 delete mode 100644 genius-1.0.11.tar.bz2
 create mode 100644 genius-1.0.12.tar.bz2
 delete mode 100644 genius-make382.patch

diff --git a/genius-1.0.11.tar.bz2 b/genius-1.0.11.tar.bz2
deleted file mode 100644
index b598260..0000000
--- a/genius-1.0.11.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ec957fadb521e300342dc45382486aa10538ec0576f6ccdf70a1c9ef9d147702
-size 1692265
diff --git a/genius-1.0.12.tar.bz2 b/genius-1.0.12.tar.bz2
new file mode 100644
index 0000000..41d5a5f
--- /dev/null
+++ b/genius-1.0.12.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e94f92474140d1549f44cd84a09e62760f4e0e6af555c565559d132556f5fde4
+size 1698688
diff --git a/genius-make382.patch b/genius-make382.patch
deleted file mode 100644
index e448db2..0000000
--- a/genius-make382.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: genius-1.0.11/gtkextra/Makefile.am
-===================================================================
---- genius-1.0.11.orig/gtkextra/Makefile.am
-+++ genius-1.0.11/gtkextra/Makefile.am
-@@ -99,13 +99,13 @@ libgtkextra_genius_a_SOURCES =	\
- 	gtkplotsurface.c
- 
- $(srcdir)/gtkextra-marshal.h: gtkextra-marshal.list
--        ( @GLIB_GENMARSHAL@ --prefix=gtkextra gtkextra-marshal.list --header > gtkextra-marshal.tmp \
--        && mv gtkextra-marshal.tmp gtkextra-marshal.h ) \
--        || ( rm -f gtkextra-marshal.tmp && exit 1 )
-+	( @GLIB_GENMARSHAL@ --prefix=gtkextra gtkextra-marshal.list --header > gtkextra-marshal.tmp \
-+	&& mv gtkextra-marshal.tmp gtkextra-marshal.h ) \
-+	|| ( rm -f gtkextra-marshal.tmp && exit 1 )
- $(srcdir)/gtkextra-marshal.c: gtkextra-marshal.h
--        ( @GLIB_GENMARSHAL@ --prefix=gtkextra gtkextra-marshal.list --body > gtkextra-marshal.tmp \
--        && mv gtkextra-marshal.tmp gtkextra-marshal.c ) \
--        || ( rm -f gtkextra-marshal.tmp && exit 1 )
-+	( @GLIB_GENMARSHAL@ --prefix=gtkextra gtkextra-marshal.list --body > gtkextra-marshal.tmp \
-+	&& mv gtkextra-marshal.tmp gtkextra-marshal.c ) \
-+	|| ( rm -f gtkextra-marshal.tmp && exit 1 )
- 
- 
- $(srcdir)/gtkextratypebuiltins.h: $(public_h_sources)
diff --git a/genius.changes b/genius.changes
index 3b9a08e..975f132 100644
--- a/genius.changes
+++ b/genius.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Thu Nov 25 18:54:06 CET 2010 - dimstar@opensuse.org
+
+- Update to version 1.0.12:
+  + Recently used files menu
+  + Only run ps2epsi on eps output if selected, it can be very slow
+    and I've realized it's not commonly needed
+  + Fix handling of comment at the end of file when running from
+    the IDE
+  + Fix handling of newlines in the lexer
+  + Fix CrossProduct
+  + Some self tests were missing in the distro
+  + Fix 64 bit build to be warning free
+  + Fix buld on Make 3.82
+  + Updated translations
+- Drop genius-make382.patch: fixed upstream. As a consequence, also
+  remove the autoreconf call in build.
+
 -------------------------------------------------------------------
 Sat Sep 11 22:02:15 UTC 2010 - dimstar@opensuse.org
 
diff --git a/genius.spec b/genius.spec
index caa7f48..779576b 100644
--- a/genius.spec
+++ b/genius.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package genius (Version 1.0.11)
+# spec file for package genius (Version 1.0.12)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,15 +19,13 @@
 
 
 Name:           genius
-Version:        1.0.11
+Version:        1.0.12
 Release:        1
 License:        GPLv3+
 Summary:        General purpose calculator and mathematics tool
 Group:          Productivity/Scientific/Math
 Url:            http://www.jirka.org/genius.html
 Source:         %{name}-%{version}.tar.bz2
-# PATCH-FIX-UPSTREAM genius-make382.patch dimstar@opensuse.org -- Fix build with make 3.82. Patch sent upstream by mail.
-Patch0:         genius-make382.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  fdupes
 BuildRequires:  gtk2-devel
@@ -88,11 +86,8 @@ genius functions are written in GEL itself.
 %lang_package
 %prep
 %setup -q
-%patch0 -p1
 
 %build
-# Required by patch0: genius-make382.patch.
-autoreconf
 export CFLAGS="$RPM_OPT_FLAGS -fstack-protector"
 %configure \
         --libexec=%{_prefix}/lib/genius \