From b4731bc49ea370339d0de39a5fbadfdfab29dbbb75a4a5a32ba3fdbc3fb028e9 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 14 Jun 2011 14:30:33 +0000 Subject: [PATCH 1/3] Updating link to change in openSUSE:Factory/grisbi revision 2.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/grisbi?expand=0&rev=063c4c26af43ea6d2e3776cc60ff357a From 3c8d61a6bf3a39f4e075ad863c49e31732b22602465750e9bb182ca7249f746e Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 16 Jun 2011 12:46:10 +0000 Subject: [PATCH 2/3] Accepting request 72850 from home:dimstar:branches:GNOME:Apps Update to 0.8.7 OBS-URL: https://build.opensuse.org/request/show/72850 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/grisbi?expand=0&rev=7 --- grisbi-0.8.6.tar.bz2 | 3 -- grisbi-0.8.7.tar.bz2 | 3 ++ grisbi-no_date_time.patch | 81 +++++++++++++++++++++++++++++++++++++++ grisbi.changes | 8 ++++ grisbi.spec | 5 ++- 5 files changed, 96 insertions(+), 4 deletions(-) delete mode 100644 grisbi-0.8.6.tar.bz2 create mode 100644 grisbi-0.8.7.tar.bz2 create mode 100644 grisbi-no_date_time.patch diff --git a/grisbi-0.8.6.tar.bz2 b/grisbi-0.8.6.tar.bz2 deleted file mode 100644 index 39d61c7..0000000 --- a/grisbi-0.8.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44b6d06b0d96270f6aa813d1cdb66a21ccc5f82fb91e42d5e7ccc0f38749407c -size 1896146 diff --git a/grisbi-0.8.7.tar.bz2 b/grisbi-0.8.7.tar.bz2 new file mode 100644 index 0000000..4a48bcb --- /dev/null +++ b/grisbi-0.8.7.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b42e14a905d4e5c91e0b1eb6310bdee556409185ddcb5d181f0b90ca847538d7 +size 1896541 diff --git a/grisbi-no_date_time.patch b/grisbi-no_date_time.patch new file mode 100644 index 0000000..df64530 --- /dev/null +++ b/grisbi-no_date_time.patch @@ -0,0 +1,81 @@ +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 ); diff --git a/grisbi.changes b/grisbi.changes index 68aac5a..c2d6f19 100644 --- a/grisbi.changes +++ b/grisbi.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Jun 7 10:02:14 CEST 2011 - dimstar@opensuse.org + +- Update to version 0.8.7: + + fixes a problem of gtk version under Windows. +- Add grisbi-no_date_time.patch: Do not add build date and time to + binaries. + ------------------------------------------------------------------- Mon May 23 23:33:43 CEST 2011 - dimstar@opensuse.org diff --git a/grisbi.spec b/grisbi.spec index 18583a1..e535751 100644 --- a/grisbi.spec +++ b/grisbi.spec @@ -18,13 +18,15 @@ Name: grisbi -Version: 0.8.6 +Version: 0.8.7 Release: 1 License: GPLv2+ Summary: Personal Accounting Application Url: http://www.grisbi.org Group: Productivity/Office/Finance Source: http://prdownloads.sourceforge.net/grisbi/grisbi-%{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. +Patch0: grisbi-no_date_time.patch # Needed for make check #BuildRequires: cunit-devel BuildRequires: fdupes @@ -47,6 +49,7 @@ One notable feature is that it respects French accounting rules. %lang_package %prep %setup -q +%patch0 -p1 %build %configure \ From 9fb3b8c07c72b446ee5402f1839550f4cc47bd31d070349e7f76261516919fab Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 16 Jun 2011 12:47:22 +0000 Subject: [PATCH 3/3] Accepting request 73839 from home:vuntz:branches:GNOME:Apps Tweak; but because of bad upstream NEWS OBS-URL: https://build.opensuse.org/request/show/73839 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/grisbi?expand=0&rev=8 --- grisbi.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grisbi.changes b/grisbi.changes index c2d6f19..45c1422 100644 --- a/grisbi.changes +++ b/grisbi.changes @@ -2,7 +2,7 @@ Tue Jun 7 10:02:14 CEST 2011 - dimstar@opensuse.org - Update to version 0.8.7: - + fixes a problem of gtk version under Windows. + + Fix a problem of gtk version under Windows. - Add grisbi-no_date_time.patch: Do not add build date and time to binaries.