forked from pool/grisbi
Accepting request 83554 from home:vuntz:branches:GNOME:Apps
Update to 0.8.8 + fix build OBS-URL: https://build.opensuse.org/request/show/83554 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/grisbi?expand=0&rev=10
This commit is contained in:
Vincent Untz
Git OBS Bridge
parent
9fb3b8c07c
commit
f072bb962f
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:b42e14a905d4e5c91e0b1eb6310bdee556409185ddcb5d181f0b90ca847538d7
|
|
||||||
size 1896541
|
|
||||||
3
grisbi-0.8.8.tar.bz2
Normal file
3
grisbi-0.8.8.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:7c69fbdff557c4b82de0b878fc2b7f6c93ab9abd72351eabbdecc9be4d78946f
|
||||||
|
size 1905934
|
||||||
27
grisbi-fix-linking.patch
Normal file
27
grisbi-fix-linking.patch
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
Index: grisbi-0.8.8/configure.in
|
||||||
|
===================================================================
|
||||||
|
--- grisbi-0.8.8.orig/configure.in
|
||||||
|
+++ grisbi-0.8.8/configure.in
|
||||||
|
@@ -54,6 +54,9 @@ dnl ====================================
|
||||||
|
dnl Main Grisbi libraries
|
||||||
|
dnl ================================================================
|
||||||
|
|
||||||
|
+AC_CHECK_LIBM
|
||||||
|
+AC_SUBST(LIBM)
|
||||||
|
+
|
||||||
|
#PKG_CHECK_MODULES(GRISBI, [gtk+-2.0 >= 2.2.0 glib-2.0 >= 2.2 gmodule-2.0 >= 2.2 zlib])
|
||||||
|
# Temporary hack until Mandriva ships zlib.pc
|
||||||
|
PKG_CHECK_MODULES(GRISBI, [gtk+-2.0 >= 2.12.0 glib-2.0 >= 2.18.0 gmodule-2.0 >= 2.18.0])
|
||||||
|
Index: grisbi-0.8.8/src/Makefile.am
|
||||||
|
===================================================================
|
||||||
|
--- grisbi-0.8.8.orig/src/Makefile.am
|
||||||
|
+++ grisbi-0.8.8/src/Makefile.am
|
||||||
|
@@ -16,7 +16,7 @@ libgrisbi_la_LIBADD += \
|
||||||
|
else
|
||||||
|
libgrisbi_la_LDFLAGS = -export_dynamic
|
||||||
|
endif
|
||||||
|
-libgrisbi_la_LIBADD += $(GRISBI_LIBS) $(IGE_MAC_LIBS)
|
||||||
|
+libgrisbi_la_LIBADD += $(LIBM) $(GRISBI_LIBS) $(IGE_MAC_LIBS)
|
||||||
|
|
||||||
|
libgrisbi_la_SOURCES = \
|
||||||
|
accueil.c \
|
||||||
@ -1,81 +0,0 @@
|
|||||||
diff -ur grisbi-0.8.7/src/help.c grisbi-0.8.7.nodate/src/help.c
|
|
||||||
--- grisbi-0.8.7/src/help.c 2011-06-06 23:09:19.000000000 +0200
|
|
||||||
+++ grisbi-0.8.7.nodate/src/help.c 2011-06-07 10:08:53.125402476 +0200
|
|
||||||
@@ -161,13 +161,6 @@
|
|
||||||
gsb_plugin_get_list(),
|
|
||||||
"\nVersion de GTK : ",
|
|
||||||
get_gtk_run_version ( ),
|
|
||||||
- "\n",
|
|
||||||
- _("This instance of Grisbi was compiled on\n"),
|
|
||||||
- gsb_date_get_compiled_time ( ) ,
|
|
||||||
- " ",
|
|
||||||
- _("at"),
|
|
||||||
- " ",
|
|
||||||
- __TIME__,
|
|
||||||
NULL );
|
|
||||||
|
|
||||||
GtkWidget * about;
|
|
||||||
diff -ur grisbi-0.8.7/src/utils_dates.c grisbi-0.8.7.nodate/src/utils_dates.c
|
|
||||||
--- grisbi-0.8.7/src/utils_dates.c 2011-06-06 23:09:19.000000000 +0200
|
|
||||||
+++ grisbi-0.8.7.nodate/src/utils_dates.c 2011-06-07 10:09:28.253867687 +0200
|
|
||||||
@@ -631,49 +631,6 @@
|
|
||||||
return gsb_parse_date_string ( string );
|
|
||||||
}
|
|
||||||
|
|
||||||
-
|
|
||||||
-/**
|
|
||||||
- * retourne la date de compilation conforme à la locale
|
|
||||||
- *
|
|
||||||
- * */
|
|
||||||
-gchar *gsb_date_get_compiled_time ( void )
|
|
||||||
-{
|
|
||||||
- GDate *date;
|
|
||||||
- gchar **tab;
|
|
||||||
- gchar *str;
|
|
||||||
- const gchar *months[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug",
|
|
||||||
- "Sep", "Oct", "Nov", "Dec"};
|
|
||||||
- gint mois = 0;
|
|
||||||
- gint i;
|
|
||||||
-
|
|
||||||
- str = g_strdup ( __DATE__ );
|
|
||||||
- if ( g_strstr_len ( str, -1, " " ) )
|
|
||||||
- {
|
|
||||||
- tab = g_strsplit ( str, " ", -1 );
|
|
||||||
- str = g_strjoinv (" ", tab);
|
|
||||||
- g_strfreev (tab);
|
|
||||||
- }
|
|
||||||
- tab = g_strsplit ( str, " ", -1 );
|
|
||||||
- g_free ( str );
|
|
||||||
-
|
|
||||||
- for (i = 0; i < 12; i++)
|
|
||||||
- {
|
|
||||||
- if ( !strcmp ( tab[0], months[i] ) )
|
|
||||||
- {
|
|
||||||
- mois = i + 1;
|
|
||||||
- break;
|
|
||||||
- }
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- date = g_date_new_dmy ( atoi ( tab[1] ), mois, atoi ( tab[2] ) );
|
|
||||||
- g_strfreev (tab);
|
|
||||||
- str = gsb_format_gdate ( date );
|
|
||||||
- g_date_free ( date );
|
|
||||||
-
|
|
||||||
- return str;
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-
|
|
||||||
/**
|
|
||||||
* returns a date with the last day of the month.
|
|
||||||
*
|
|
||||||
diff -ur grisbi-0.8.7/src/utils_dates.h grisbi-0.8.7.nodate/src/utils_dates.h
|
|
||||||
--- grisbi-0.8.7/src/utils_dates.h 2011-06-06 23:09:19.000000000 +0200
|
|
||||||
+++ grisbi-0.8.7.nodate/src/utils_dates.h 2011-06-07 10:09:34.193945917 +0200
|
|
||||||
@@ -12,7 +12,6 @@
|
|
||||||
gboolean gsb_date_check_entry ( GtkWidget *entry );
|
|
||||||
GDate *gsb_date_copy ( const GDate *date );
|
|
||||||
void gsb_date_free_last_date ( void );
|
|
||||||
-gchar *gsb_date_get_compiled_time ( void );
|
|
||||||
gchar *gsb_date_get_format_date ( void );
|
|
||||||
GDate *gsb_date_get_last_day_of_month ( const GDate *date );
|
|
||||||
GDate *gsb_date_get_last_entry_date ( const gchar *string );
|
|
||||||
@ -1,3 +1,18 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Sep 19 07:35:50 UTC 2011 - vuntz@opensuse.org
|
||||||
|
|
||||||
|
- Update to version 0.8.8:
|
||||||
|
+ Fix bug where the transaction is not transferred to the new
|
||||||
|
account when Edit menu is used
|
||||||
|
+ Fix the name of the International Russian currency RUB -> RUR
|
||||||
|
+ Fix some bugs in the navigation in the left panel
|
||||||
|
+ Fix a crash when the number of recently used files = 0
|
||||||
|
+ Remove the display of the build date for stable versions
|
||||||
|
- Drop grisbi-no_date_time.patch: fixed upstream.
|
||||||
|
- Add grisbi-fix-linking.patch: fix build with strict linker, as in
|
||||||
|
Factory.
|
||||||
|
- Add call to autoreconf, needed for above patch.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Jun 7 10:02:14 CEST 2011 - dimstar@opensuse.org
|
Tue Jun 7 10:02:14 CEST 2011 - dimstar@opensuse.org
|
||||||
|
|
||||||
|
|||||||
10
grisbi.spec
10
grisbi.spec
@ -18,15 +18,15 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: grisbi
|
Name: grisbi
|
||||||
Version: 0.8.7
|
Version: 0.8.8
|
||||||
Release: 1
|
Release: 1
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
Summary: Personal Accounting Application
|
Summary: Personal Accounting Application
|
||||||
Url: http://www.grisbi.org
|
Url: http://www.grisbi.org
|
||||||
Group: Productivity/Office/Finance
|
Group: Productivity/Office/Finance
|
||||||
Source: http://prdownloads.sourceforge.net/grisbi/grisbi-%{version}.tar.bz2
|
Source: http://downloads.sourceforge.net/project/grisbi/grisbi%20stable/0.8.x/%{name}-%{version}.tar.bz2
|
||||||
# PATCH-FEATURE-UPSTREAM grisbi-no_date_time.patch http://www.grisbi.org/bugsreports/view.php?id=1355 dimstar@opensuse.org -- Do not add build date/time to binaries.
|
# PATCH-FIX-UPSTREAM grisbi-fix-linking.patch vuntz@opensuse.org -- Fix build with strict linker; sent upstream by mail on 2011-09-19
|
||||||
Patch0: grisbi-no_date_time.patch
|
Patch0: grisbi-fix-linking.patch
|
||||||
# Needed for make check
|
# Needed for make check
|
||||||
#BuildRequires: cunit-devel
|
#BuildRequires: cunit-devel
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
@ -52,6 +52,8 @@ One notable feature is that it respects French accounting rules.
|
|||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
# needed for patch0
|
||||||
|
autoreconf -fi
|
||||||
%configure \
|
%configure \
|
||||||
--disable-static \
|
--disable-static \
|
||||||
--with-ofx
|
--with-ofx
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user