diff --git a/.cvsignore b/.cvsignore index 1772f52..b3217ee 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -grisbi-0.5.2.tar.bz2 +grisbi-0.5.5.tar.bz2 diff --git a/constants.h.htmlview b/constants.h.htmlview deleted file mode 100644 index dc2aac9..0000000 --- a/constants.h.htmlview +++ /dev/null @@ -1,10 +0,0 @@ ---- src/constants.h.old 2004-05-12 22:47:17.000000000 +0200 -+++ src/constants.h 2004-10-14 22:28:28.000000000 +0200 -@@ -112,6 +112,6 @@ - #endif - - /* quelques chaines de configuration*/ --#define ETAT_WWW_BROWSER "www-browser" -+#define ETAT_WWW_BROWSER "htmlview" - - #endif // !_CONSTANTS_H diff --git a/grisbi-0.5.2-20041029-etats_calculs.c.diff b/grisbi-0.5.2-20041029-etats_calculs.c.diff deleted file mode 100644 index a53f367..0000000 --- a/grisbi-0.5.2-20041029-etats_calculs.c.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- grisbi-0.5.2/src/etats_calculs.c 2004-07-29 16:03:14.000000000 +0200 -+++ grisbi-testing/src/etats_calculs.c 2004-10-27 09:00:10.000000000 +0200 -@@ -818,8 +818,6 @@ - g_date_year ( date_jour ) ); - g_date_subtract_months ( date_tmp, - 3 ); -- g_date_subtract_months ( date_jour, -- 1 ); - if ( g_date_compare ( date_tmp, - operation -> date ) > 0 - || -@@ -836,8 +834,6 @@ - g_date_year ( date_jour ) ); - g_date_subtract_months ( date_tmp, - 6 ); -- g_date_subtract_months ( date_jour, -- 1 ); - if ( g_date_compare ( date_tmp, - operation -> date ) > 0 - || -@@ -854,8 +850,6 @@ - g_date_year ( date_jour ) ); - g_date_subtract_months ( date_tmp, - 12 ); -- g_date_subtract_months ( date_jour, -- 1 ); - if ( g_date_compare ( date_tmp, - operation -> date ) > 0 - || diff --git a/grisbi-0.5.2-20041029-operations_liste.c.diff b/grisbi-0.5.2-20041029-operations_liste.c.diff deleted file mode 100644 index 7cb06ba..0000000 --- a/grisbi-0.5.2-20041029-operations_liste.c.diff +++ /dev/null @@ -1,92 +0,0 @@ ---- grisbi-0.5.2/src/operations_liste.c 2004-10-04 22:45:18.000000000 +0200 -+++ grisbi-testing/src/operations_liste.c 2004-10-27 09:00:11.000000000 +0200 -@@ -457,6 +457,11 @@ - - /* sauvegarde les redimensionnement des colonnes */ - -+ gtk_signal_connect ( GTK_OBJECT ( liste ), -+ "resize_column", -+ GTK_SIGNAL_FUNC ( changement_taille_colonne ), -+ NULL ); -+ - CLIST_OPERATIONS = liste; - - /* par défaut, le classement de la liste s'effectue par date */ -@@ -464,11 +469,6 @@ - LISTE_OPERATIONS = g_slist_sort ( LISTE_OPERATIONS, - (GCompareFunc) classement_sliste ); - -- gtk_signal_connect ( GTK_OBJECT ( liste ), -- "resize_column", -- GTK_SIGNAL_FUNC ( changement_taille_colonne ), -- NULL ); -- - /* on ajoute l'onglet au notebook des comptes */ - gtk_notebook_append_page ( GTK_NOTEBOOK ( notebook_listes_operations ), - onglet, -@@ -1171,9 +1171,6 @@ - } - } - -- if ( col == -1 ) -- return FALSE; -- - /* si le click se situe dans les menus, c'est qu'on redimensionne, on fait rien */ - - if ( evenement -> window != liste -> clist_window ) -@@ -2294,10 +2291,14 @@ - gint largeur; - gint col0, col1, col2, col3, col4, col5, col6; - -+ /* Yet another kludge to avoid breakage due to #392 fix (closes: #470) */ -+ if ( compte != compte_courant_onglet ) -+ return TRUE; -+ - /* si la largeur de grisbi est < 700, on fait rien */ - - if ( window -> allocation.width < 700 ) -- return FALSE; -+ return TRUE; - - /* pour éviter que le système ne s'emballe... */ - /* encore plus grosse magouille avec allocation_encore_avant pour éviter */ -@@ -2306,11 +2307,11 @@ - - if ( allocation_compte_precedent == (gint) compte && - allocation -> width == allocation_precedente ) -- return FALSE; -+ return TRUE; - - if ( allocation_compte_precedent == (gint) compte && - allocation -> width == allocation_encore_avant ) -- return FALSE; -+ return TRUE; - - allocation_precedente = allocation_encore_avant; - allocation_encore_avant = allocation -> width; -@@ -2416,7 +2417,7 @@ - col6, - FALSE ); - -- return FALSE; -+ return TRUE; - } - /******************************************************************************/ - -@@ -2607,14 +2608,14 @@ - { - if ( !GTK_WIDGET_REALIZED(clist) ) - { -- return FALSE; -+ return TRUE; - } - - /* Why would we need to reset the form here? */ - /* echap_formulaire(); */ - taille_largeur_colonnes[colonne] = largeur; - -- return FALSE; -+ return TRUE; - } - /******************************************************************************/ - diff --git a/grisbi-0.5.5-htmlview.diff b/grisbi-0.5.5-htmlview.diff new file mode 100644 index 0000000..28a25d6 --- /dev/null +++ b/grisbi-0.5.5-htmlview.diff @@ -0,0 +1,10 @@ +--- src/constants.h.old 2004-11-26 11:48:47.000000000 +0100 ++++ src/constants.h 2004-11-27 16:55:59.067842048 +0100 +@@ -112,6 +112,6 @@ + #endif + + /* quelques chaines de configuration*/ +-#define ETAT_WWW_BROWSER "mozilla" ++#define ETAT_WWW_BROWSER "htmlview" + + #endif // !_CONSTANTS_H diff --git a/grisbi.spec b/grisbi.spec index f84d9f0..88e9462 100644 --- a/grisbi.spec +++ b/grisbi.spec @@ -1,7 +1,7 @@ %define GRISBI_HELP_DIR %{_datadir}/doc/%{name}/help Name: grisbi -Version: 0.5.2 -Release: 4 +Version: 0.5.5 +Release: 1 Epoch: 0 Summary: Personal finances manager @@ -10,9 +10,7 @@ License: GPL Url: http://www.grisbi.org Source0: http://dl.sf.net/grisbi/%{name}-%{version}.tar.bz2 Source1: %{name}.desktop -Patch0: constants.h.htmlview -Patch1: %{name}-%{version}-20041029-etats_calculs.c.diff -Patch2: %{name}-%{version}-20041029-operations_liste.c.diff +Patch0: %{name}-%{version}-htmlview.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel, libxml2-devel, glib2-devel, gettext @@ -36,8 +34,6 @@ party, nice and easy user interface, user manual, QIF import/export. %prep %setup -q %patch0 -%patch1 -p1 -%patch2 -p1 %build %configure @@ -47,7 +43,7 @@ make %{?_smp_mflags} rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -for lang in C fr +for lang in C de fr do mv $RPM_BUILD_ROOT%{GRISBI_HELP_DIR}/${lang}/grisbi-manuel.html $RPM_BUILD_ROOT%{GRISBI_HELP_DIR}/${lang}/grisbi-manuel.bin.html touch $RPM_BUILD_ROOT%{GRISBI_HELP_DIR}/${lang}/grisbi-manuel.html @@ -67,14 +63,18 @@ ln -s grisbi/grisbi.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/grisbi.png %post if [ $1 -eq 1 ] ; then - alternatives --install %{GRISBI_HELP_DIR}/fr/grisbi-manuel.html grisbi-manuel-fr %{GRISBI_HELP_DIR}/fr/grisbi-manuel.bin.html 10 - alternatives --install %{GRISBI_HELP_DIR}/C/grisbi-manuel.html grisbi-manuel %{GRISBI_HELP_DIR}/C/grisbi-manuel.bin.html 10 + for lang in C de fr + do + alternatives --install %{GRISBI_HELP_DIR}/${lang}/grisbi-manuel.html grisbi-manuel-${lang} %{GRISBI_HELP_DIR}/${lang}/grisbi-manuel.bin.html 10 || : + done fi %postun if [ $1 -eq 0 ] ; then - alternatives --remove grisbi-manuel %{GRISBI_HELP_DIR}/C/grisbi-manuel.bin.html - alternatives --remove grisbi-manuel-fr %{GRISBI_HELP_DIR}/fr/grisbi-manuel.bin.html + for lang in C de fr + do + alternatives --remove grisbi-manuel-${lang} %{GRISBI_HELP_DIR}/${lang}/grisbi-manuel.bin.html || : + done fi %clean @@ -89,50 +89,58 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pixmaps/* %dir %{_datadir}/doc/%{name} %dir %{_datadir}/doc/%{name}/help -%dir %{_datadir}/doc/%{name}/help/fr %dir %{_datadir}/doc/%{name}/help/C -%{_datadir}/doc/%{name}/help/fr/*.gif -%{_datadir}/doc/%{name}/help/fr/grisbi-manuel.bin.html -%{_datadir}/doc/%{name}/help/fr/quickstart.html -%{_datadir}/doc/%{name}/help/fr/translation.html -%{_datadir}/doc/%{name}/help/fr/topic.dat +%dir %{_datadir}/doc/%{name}/help/de +%dir %{_datadir}/doc/%{name}/help/fr %{_datadir}/doc/%{name}/help/C/*.gif %{_datadir}/doc/%{name}/help/C/grisbi-manuel.bin.html %{_datadir}/doc/%{name}/help/C/quickstart.html %{_datadir}/doc/%{name}/help/C/translation.html %{_datadir}/doc/%{name}/help/C/topic.dat +%{_datadir}/doc/%{name}/help/de/*.gif +%{_datadir}/doc/%{name}/help/de/grisbi-manuel.bin.html +%{_datadir}/doc/%{name}/help/de/quickstart.html +%{_datadir}/doc/%{name}/help/de/translation.html +%{_datadir}/doc/%{name}/help/de/topic.dat +%{_datadir}/doc/%{name}/help/fr/*.gif +%{_datadir}/doc/%{name}/help/fr/grisbi-manuel.bin.html +%{_datadir}/doc/%{name}/help/fr/quickstart.html +%{_datadir}/doc/%{name}/help/fr/translation.html +%{_datadir}/doc/%{name}/help/fr/topic.dat %{_mandir}/man1/* %ghost %{_datadir}/doc/%{name}/help/C/grisbi-manuel.html +%ghost %{_datadir}/doc/%{name}/help/de/grisbi-manuel.html %ghost %{_datadir}/doc/%{name}/help/fr/grisbi-manuel.html %changelog -* Fri Oct 29 2004 Alain Portal 0:0.5.2-4 +* Mon Jan 10 2005 Alain Portal 0:0.5.5-1 + - New version + - Fix alternatives setup +* Sat Nov 27 2004 Alain Portal 0:0.5.3-0.fdr.1 + - New version +* Tue Nov 2 2004 Alain Portal 0:0.5.2-0.fdr.4 + - Rename htmlview patch + - Force scriplet to return 0 +* Fri Oct 29 2004 Alain Portal 0:0.5.2-0.fdr.3 - Patch to fix bugs #468, #470 - * Fri Oct 22 2004 Alain Portal 0:0.5.2-0.fdr.2 - %{GRISBI_HELP_DIR}/${lang}/grisbi-manuel.html should be owned by the package. - Improve %post and %postun scripts depends upon whe are installing or upgrading. - * Fri Oct 15 2004 Alain Portal 0:0.5.2-0.fdr.1 - New version - * Wed Sep 15 2004 Alain Portal 0:0.5.1-0.fdr.2 - Use "alternatives" to manage separate documentation package - * Sat Jul 31 2004 Alain Portal 0:0.5.1-0.fdr.1 - New version - Patches to fix some compilation warnings - Add %post and %preun scripts to manage separate documentation package - * Fri Jul 23 2004 Aurelien Bompard 0:0.5.0-0.fdr.3 -- Fix typo in summary -- Change category to "Office" -- Change Terminal=0 to Terminal=false in desktop file - + - Fix typo in summary + - Change category to "Office" + - Change Terminal=0 to Terminal=false in desktop file * Tue Jun 01 2004 Aurelien Bompard 0:0.5.0-0.fdr.2 -- BR: libofx-devel to enable OFX import - + - BR: libofx-devel to enable OFX import * Mon May 31 2004 Aurelien Bompard 0:0.5.0-0.fdr.1 -- Initial Fedora RPM + - Initial Fedora RPM diff --git a/sources b/sources index abaacb5..30dd9e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5d496c64973452f2cf35def2d1e57b01 grisbi-0.5.2.tar.bz2 +09b06382f9bb5a4124c40296c5eba6d5 grisbi-0.5.5.tar.bz2