- updated to 2.6.12

diff --git a/gnucash.spec b/gnucash.spec
index 15c96e017804e97a5b536a1c7db9070f66fc39ee..bf6785bf5d4a8131022496d7900322ebe1651e10 100644 (file)
--- a/gnucash.spec
+++ b/gnucash.spec
@@ -20,16 +20,17 @@ Summary(pl.UTF-8):  GnuCash - aplikacja do zarządzania twoimi finansami
 Summary(pt_BR.UTF-8):  O GnuCash é uma aplicação para acompanhamento de suas finanças
 Summary(zh_CN.UTF-8):  GnuCash - 您的个人财务管理软件
 Name:          gnucash
-Version:       2.6.11
+Version:       2.6.12
 Release:       1
 License:       GPL v2+
 Group:         X11/Applications
 Source0:       http://downloads.sourceforge.net/gnucash/%{name}-%{version}.tar.bz2
-# Source0-md5: dcad81fb22c682804b5e4ebba3b39ea0
+# Source0-md5: c8f3b464bdd38bb6af3023f395cc88e3
 Source1:       %{name}-icon.png
 Source2:       %{name}.sh
 Patch0:                %{name}-env.patch
 Patch1:                %{name}-path.patch
+Patch2:                lto.patch
 URL:           http://www.gnucash.org/
 BuildRequires: GConf2-devel >= 2.0
 BuildRequires: autoconf
@@ -121,6 +122,7 @@ Pliki nagłówkowe bibliotek GnuCash.
 
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # force regeneration after patching types in table.m4
 rm -f src/backend/postgres/base-autogen.c
@@ -164,13 +166,12 @@ install -d $RPM_BUILD_ROOT%{_pixmapsdir}
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_pixmapsdir}
 mv $RPM_BUILD_ROOT%{_bindir}/gnucash{,-bin}
 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/gnucash
-mv $RPM_BUILD_ROOT%{_datadir}/locale/{pt_PT,pt}/LC_MESSAGES/gnucash.mo
 
 ## Cleanup
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
 %{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{name}/src
 %{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}/*win32-bin.txt
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/{kok@latin,mni@bengali,pt_PT}
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/{kok@latin,mni@bengali}
 
 %find_lang %{name}
 # --with-gnome
@@ -271,6 +272,7 @@ fi
 %{_docdir}/%{name}/ChangeLog.2012
 %{_docdir}/%{name}/ChangeLog.2013
 %{_docdir}/%{name}/ChangeLog.2014
+%{_docdir}/%{name}/ChangeLog.2015
 %{_docdir}/%{name}/DOCUMENTERS
 %{_docdir}/%{name}/HACKING
 %{_docdir}/%{name}/INSTALL

diff --git a/lto.patch b/lto.patch
new file mode 100644 (file)
index 0000000..02d00b6
--- /dev/null
+++ b/lto.patch
@@ -0,0 +1,47 @@
+--- gnucash-2.6.12/src/optional/gtkmm/gncmm/wrap_init.cpp.orig 2015-12-01 21:54:54.000000000 +0100
++++ gnucash-2.6.12/src/optional/gtkmm/gncmm/wrap_init.cpp      2016-04-09 08:46:19.147136139 +0200
+@@ -52,14 +52,14 @@
+     GType qof_instance_get_type (void);
+ } // extern "C"
+ 
+-//Declarations of the *_Class::wrap_new() methods, instead of including all the private headers:
++//Private headers have to be included. Otherwise one definition rule is violated.
+ 
+-namespace gnc {  class Account_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
+-namespace gnc {  class Book_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
+-namespace gnc {  class Commodity_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
+-namespace gnc {  class GncInstance_Class { public : static Glib::ObjectBase* wrap_new(GObject*); }; }
+-namespace gnc {  class Split_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
+-namespace gnc {  class Transaction_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
++#include "private/Account_p.hpp" 
++#include "private/Book_p.hpp" 
++#include "private/Commodity_p.hpp" 
++#include "private/GncInstance_p.hpp" 
++#include "private/Split_p.hpp" 
++#include "private/Transaction_p.hpp" 
+ 
+ namespace gnc
+ {
+--- gnucash-2.6.12/src/optional/gtkmm/gncmm/private/GncInstance_p.hpp.orig     2015-06-29 01:43:24.000000000 +0200
++++ gnucash-2.6.12/src/optional/gtkmm/gncmm/private/GncInstance_p.hpp  2016-04-09 09:42:14.883898423 +0200
+@@ -1,7 +1,7 @@
+ // -*- c++ -*-
+ // Generated by gtkmmproc -- DO NOT MODIFY!
+-#ifndef _GNCMM_GNC_COMMODITY_P_H
+-#define _GNCMM_GNC_COMMODITY_P_H
++#ifndef _GNCMM_GNC_GNCINSTANCE_P_H
++#define _GNCMM_GNC_GNCINSTANCE_P_H
+ 
+ 
+ #include <glibmm/private/object_p.h>
+--- gnucash-2.6.12/src/optional/gtkmm/test/Makefile.am.orig    2016-01-25 17:33:23.000000000 +0100
++++ gnucash-2.6.12/src/optional/gtkmm/test/Makefile.am 2016-04-09 11:18:22.803435318 +0200
+@@ -24,7 +24,7 @@
+       test-gtkmm.cpp \
+       test-book.cpp
+ 
+-test_gtkmm_HEADERS = \
++noinst_HEADERS = \
+       $(top_srcdir)/${MODULEPATH}/gncmm/Book.hpp
+ 
+ #The tests might require more libraries, but try to keep them