rpms/grisbi/devel constants.h.htmlview, NONE, 1.1 grisbi-0.5.2-20041029-etats_calculs.c.diff, NONE, 1.1 grisbi-0.5.2-20041029-operations_liste.c.diff, NONE, 1.1 .cvsignore, 1.2, 1.3 grisbi.desktop, 1.1, 1.2 grisbi.spec, 1.1, 1.2 sources, 1.2, 1.3 grisbi-0.5-htmlview.patch, 1.1, NONE

[Michael Schwendt (mschwendt)]

Changeset from: mschwendt

Update of /cvs/extras/rpms/grisbi/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv14172

Modified Files:
	.cvsignore grisbi.desktop grisbi.spec sources 
Added Files:
	constants.h.htmlview 
	grisbi-0.5.2-20041029-etats_calculs.c.diff 
	grisbi-0.5.2-20041029-operations_liste.c.diff 
Removed Files:
	grisbi-0.5-htmlview.patch 
Log Message:
Sync with 0.5.2-0.fdr.3.2 update + bump release.


--- NEW FILE constants.h.htmlview ---
--- 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

grisbi-0.5.2-20041029-etats_calculs.c.diff:

--- NEW FILE grisbi-0.5.2-20041029-etats_calculs.c.diff ---
--- 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
 				 ||

grisbi-0.5.2-20041029-operations_liste.c.diff:

--- NEW FILE grisbi-0.5.2-20041029-operations_liste.c.diff ---
--- 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;
 }
 /******************************************************************************/
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grisbi/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:30:07 -0000	1.2
+++ .cvsignore	25 Nov 2004 05:45:52 -0000	1.3
@@ -1 +1 @@
-grisbi-0.5.0.tar.bz2
+grisbi-0.5.2.tar.bz2


Index: grisbi.desktop
===================================================================
RCS file: /cvs/extras/rpms/grisbi/devel/grisbi.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grisbi.desktop	8 Nov 2004 04:30:07 -0000	1.1
+++ grisbi.desktop	25 Nov 2004 05:45:52 -0000	1.2
@@ -1,6 +1,10 @@
 [Desktop Entry]
 Name=Grisbi
 Comment=Personal finances manager
+Comment[fr]=Gestionnaire de finances personnelles
+Comment[br]=Program a gonterezh an ti
+Comment[hu]=Személyi pénzügyi menedzser
+Comment[it]=Software di contabilità personale
 Exec=grisbi
 Icon=grisbi.png
 Terminal=false


Index: grisbi.spec
===================================================================
RCS file: /cvs/extras/rpms/grisbi/devel/grisbi.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grisbi.spec	8 Nov 2004 04:30:07 -0000	1.1
+++ grisbi.spec	25 Nov 2004 05:45:52 -0000	1.2
@@ -1,22 +1,25 @@
+%define GRISBI_HELP_DIR %{_datadir}/doc/%{name}/help
 Name: 		grisbi
-Version:	0.5.0
-Release: 	0.fdr.3.2
-Epoch:      0
+Version:	0.5.2
+Release: 	4
+Epoch:		0
 Summary: 	Personal finances manager
 
 Group: 		Applications/Productivity
 License: 	GPL
 Url: 		http://www.grisbi.org
-Source0:    http://dl.sf.net/grisbi/grisbi-0.5.0.tar.bz2
-Source1:    grisbi.desktop
-Patch0:     grisbi-0.5-htmlview.patch
+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
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk2-devel, libxml2-devel, glib2-devel, gettext
-BuildRequires:  desktop-file-utils, libofx-devel
-Requires:   htmlview
+BuildRequires:	desktop-file-utils, libofx-devel
+Requires:	htmlview
 # for report generation
-Requires:   tetex-unicode, tetex-dvips
+Requires:	tetex-unicode, tetex-dvips
 
 %description
 Grisbi is a very functional personal financial management program
@@ -32,7 +35,9 @@
 
 %prep
 %setup -q 
-%patch0 -p0 -b .htmlview
+%patch0
+%patch1 -p1
+%patch2 -p1
 
 %build
 %configure
@@ -42,6 +47,12 @@
 rm -rf $RPM_BUILD_ROOT 
 make install DESTDIR=$RPM_BUILD_ROOT
 
+for lang in C 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
+done
+
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -54,6 +65,18 @@
 
 %find_lang %{name}
 
+%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
+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
+fi
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -61,13 +84,48 @@
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING NEWS OLDNEWS README ABOUT-NLS
 %attr(755,root,root) %{_bindir}/*
-%{_datadir}/applications/*.desktop
-%{_datadir}/doc/grisbi
-%{_datadir}/mime-info/%name.*
+%{_datadir}/applications/*
+%{_datadir}/mime-info/%{name}.*
 %{_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
+%{_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
 %{_mandir}/man1/*
+%ghost %{_datadir}/doc/%{name}/help/C/grisbi-manuel.html
+%ghost %{_datadir}/doc/%{name}/help/fr/grisbi-manuel.html
 
 %changelog
+* Fri Oct 29 2004 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0:0.5.2-4
+  - Patch to fix bugs #468, #470
+
+* Fri Oct 22 2004 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 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 <aportal[AT]univ-montp2[DOT]fr> 0:0.5.2-0.fdr.1
+  - New version
+
+* Wed Sep 15 2004 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0:0.5.1-0.fdr.2
+  - Use "alternatives" to manage separate documentation package
+
+* Sat Jul 31 2004 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 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 <gauret[AT]free.fr> 0:0.5.0-0.fdr.3
 - Fix typo in summary
 - Change category to "Office"


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grisbi/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:30:07 -0000	1.2
+++ sources	25 Nov 2004 05:45:52 -0000	1.3
@@ -1 +1 @@
-ceccf6799317686fe53f61730241f7e1  grisbi-0.5.0.tar.bz2
+5d496c64973452f2cf35def2d1e57b01  grisbi-0.5.2.tar.bz2


--- grisbi-0.5-htmlview.patch DELETED ---