rpms/grisbi/FC-2 grisbi-0.5.5-htmlview.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

Sat Jan 15 09:42:45 UTC 2005

Author: scop

Update of /cvs/extras/rpms/grisbi/FC-2
In directory cvs.fedora.redhat.com:/tmp/cvs-serv19875/FC-2

Modified Files:
	.cvsignore grisbi.desktop grisbi.spec sources 
Added Files:
	grisbi-0.5.5-htmlview.diff 
Removed Files:
	grisbi-0.5-htmlview.patch 
Log Message:
auto-import grisbi-0.5.5-0.fdr.1.2 on branch FC-2 from grisbi-0.5.5-0.fdr.1.2.src.rpm

grisbi-0.5.5-htmlview.diff:

--- NEW FILE grisbi-0.5.5-htmlview.diff ---
--- 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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grisbi/FC-2/.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	15 Jan 2005 09:42:43 -0000	1.3
@@ -1 +1 @@
-grisbi-0.5.0.tar.bz2
+grisbi-0.5.5.tar.bz2


Index: grisbi.desktop
===================================================================
RCS file: /cvs/extras/rpms/grisbi/FC-2/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	15 Jan 2005 09:42:43 -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/FC-2/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	15 Jan 2005 09:42:43 -0000	1.2
@@ -1,22 +1,23 @@
+%define GRISBI_HELP_DIR %{_datadir}/doc/%{name}/help
 Name: 		grisbi
-Version:	0.5.0
-Release: 	0.fdr.3.2
-Epoch:      0
+Version:	0.5.5
+Release: 	0.fdr.1.2
+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:		%{name}-%{version}-htmlview.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 +33,7 @@
 
 %prep
 %setup -q 
-%patch0 -p0 -b .htmlview
+%patch0
 
 %build
 %configure
@@ -42,6 +43,12 @@
 rm -rf $RPM_BUILD_ROOT 
 make install DESTDIR=$RPM_BUILD_ROOT
 
+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
+done
+
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -54,6 +61,22 @@
 
 %find_lang %{name}
 
+%post
+if [ $1 -eq 1 ] ; then
+  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
+  for lang in C de fr
+  do
+    alternatives --remove grisbi-manuel-${lang} %{GRISBI_HELP_DIR}/${lang}/grisbi-manuel.bin.html || :
+  done
+fi
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -61,20 +84,63 @@
 %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/C
+%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
+* Mon Jan 10 2005 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0:0.5.5-0.fdr.1
+  - New version
+  - Fix alternatives setup
+* Sat Nov 27 2004 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0:0.5.3-0.fdr.1
+  - New version
+* Tue Nov 2 2004 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0:0.5.2-0.fdr.4
+  - Rename htmlview patch
+  - Force scriplet to return 0
+* Fri Oct 29 2004 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0:0.5.2-0.fdr.3
+  - 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"
-- 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 <gauret[AT]free.fr> 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 <gauret[AT]free.fr> 0:0.5.0-0.fdr.1
-- Initial Fedora RPM
+  - Initial Fedora RPM


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grisbi/FC-2/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	15 Jan 2005 09:42:43 -0000	1.3
@@ -1 +1 @@
-ceccf6799317686fe53f61730241f7e1  grisbi-0.5.0.tar.bz2
+09b06382f9bb5a4124c40296c5eba6d5  grisbi-0.5.5.tar.bz2


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


