rpms/grisbi/devel grisbi-0.5.5-htmlview.diff, NONE, 1.1 .cvsignore, 1.3, 1.4 grisbi.spec, 1.2, 1.3 sources, 1.3, 1.4 constants.h.htmlview, 1.1, NONE grisbi-0.5.2-20041029-etats_calculs.c.diff, 1.1, NONE grisbi-0.5.2-20041029-operations_liste.c.diff, 1.1, NONE
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Sat Jan 15 09:44:38 UTC 2005
Author: scop
Update of /cvs/extras/rpms/grisbi/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv20012/devel
Modified Files:
.cvsignore grisbi.spec sources
Added Files:
grisbi-0.5.5-htmlview.diff
Removed Files:
constants.h.htmlview
grisbi-0.5.2-20041029-etats_calculs.c.diff
grisbi-0.5.2-20041029-operations_liste.c.diff
Log Message:
auto-import grisbi-0.5.5-1 on branch devel from grisbi-0.5.5-1.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/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 25 Nov 2004 05:45:52 -0000 1.3
+++ .cvsignore 15 Jan 2005 09:44:36 -0000 1.4
@@ -1 +1 @@
-grisbi-0.5.2.tar.bz2
+grisbi-0.5.5.tar.bz2
Index: grisbi.spec
===================================================================
RCS file: /cvs/extras/rpms/grisbi/devel/grisbi.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- grisbi.spec 25 Nov 2004 05:45:52 -0000 1.2
+++ grisbi.spec 15 Jan 2005 09:44:36 -0000 1.3
@@ -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 @@
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 @@
%prep
%setup -q
%patch0
-%patch1 -p1
-%patch2 -p1
%build
%configure
@@ -47,7 +43,7 @@
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 @@
%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 @@
%{_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 <aportal[AT]univ-montp2[DOT]fr> 0:0.5.2-4
+* Mon Jan 10 2005 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0:0.5.5-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/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 25 Nov 2004 05:45:52 -0000 1.3
+++ sources 15 Jan 2005 09:44:36 -0000 1.4
@@ -1 +1 @@
-5d496c64973452f2cf35def2d1e57b01 grisbi-0.5.2.tar.bz2
+09b06382f9bb5a4124c40296c5eba6d5 grisbi-0.5.5.tar.bz2
--- constants.h.htmlview DELETED ---
--- grisbi-0.5.2-20041029-etats_calculs.c.diff DELETED ---
--- grisbi-0.5.2-20041029-operations_liste.c.diff DELETED ---
More information about the fedora-extras-commits
mailing list