rpms/grisbi/F-13 .cvsignore, 1.7, 1.8 grisbi-dso.patch, 1.1, 1.2 grisbi.spec, 1.24, 1.25 sources, 1.7, 1.8

Fri May 21 06:20:04 UTC 2010

Author: abompard

Update of /cvs/pkgs/rpms/grisbi/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv5688/F-13

Modified Files:
	.cvsignore grisbi-dso.patch grisbi.spec sources 
Log Message:
* Thu May 20 2010 Aurelien Bompard <abompard at fedoraproject.org> -  0.6.0-1
- version 0.6.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/grisbi/F-13/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8

--- .cvsignore	28 Sep 2006 08:26:48 -0000	1.7
+++ .cvsignore	21 May 2010 06:20:04 -0000	1.8
@@ -1 +1 @@
-grisbi-0.5.9.tar.bz2
+grisbi-0.6.0.tar.bz2

grisbi-dso.patch:
 configure.in |    2 ++
 1 file changed, 2 insertions(+)

Index: grisbi-dso.patch
===================================================================
RCS file: /cvs/pkgs/rpms/grisbi/F-13/grisbi-dso.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- grisbi-dso.patch	5 May 2010 20:39:55 -0000	1.1
+++ grisbi-dso.patch	21 May 2010 06:20:04 -0000	1.2
@@ -1,12 +1,11 @@
-diff -up ./configure.in.implicit ./configure.in
---- ./configure.in.implicit	2010-05-05 09:22:03.771470768 +0200
-+++ ./configure.in	2010-05-05 09:22:42.459497327 +0200
-@@ -51,7 +51,7 @@ AM_CONDITIONAL(NOOFX, test x$noofx = xtr
- AC_SUBST(prefix)
+--- configure.in.dso	2010-04-28 18:19:58.000000000 +0200
++++ configure.in	2010-05-20 08:48:19.619648407 +0200
+@@ -261,6 +261,8 @@
+ AC_SUBST(GSB_NOOPTIM)
  
- PKG_CHECK_MODULES(GRISBI, gtk+-2.0 >= 2.2.0 glib-2.0 libxml-2.0 >= 2.0)
--LDFLAGS="${LDFLAGS} ${GRISBI_LIBS}"
-+LDFLAGS="${LDFLAGS} ${GRISBI_LIBS} -lm"
- CFLAGS="${CFLAGS} ${GRISBI_CFLAGS}"
  
++# Avoid implicit dynamic linking
++LDFLAGS="${LDFLAGS} -lm -lz"
  
+ AC_SUBST(GTK_LIBS)
+ AC_SUBST(GTK_CFLAGS)


Index: grisbi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grisbi/F-13/grisbi.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- grisbi.spec	5 May 2010 20:39:55 -0000	1.24
+++ grisbi.spec	21 May 2010 06:20:04 -0000	1.25
@@ -1,27 +1,22 @@
-%define GRISBI_HELP_DIR %{_datadir}/doc/%{name}/help
 Name:		grisbi
-Version:	0.5.9
-Release:	11%{?dist}
+Version:	0.6.0
+Release:	1%{?dist}
 Summary:	Personal finances manager
 
 Group:		Applications/Productivity
 License:	GPLv2+
 URL:		http://www.grisbi.org
 Source0:	http://dl.sf.net/grisbi/%{name}-%{version}.tar.bz2
-Source1:	%{name}.desktop
-Patch0:		grisbi-0.5.9-xdgopen.patch
-Patch1:     grisbi-0.5.9-check.g_free.patch
-Patch2:     grisbi-dso.patch
+Patch0:     grisbi-dso.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk2-devel, libxml2-devel, glib2-devel, gettext
 BuildRequires:	desktop-file-utils, libofx-devel >= 0.7.0
+BuildRequires:  openssl-devel
 # Only as long as we have to run autogen.sh
 BuildRequires:  gettext-devel
 
 Requires:	xdg-utils
-# for report generation
-Requires:	texlive-texmf-latex, texlive-dvips
 
 %description
 Grisbi is a very functional personal financial management program
@@ -37,10 +32,8 @@ party, nice and easy user interface, use
 
 %prep
 %setup -q
-%patch0 -p0 -b .xdgopen
-%patch1 -p1 -b .check-g_free
-%patch2 -p0 -b .dso
-./autogen.sh
+%patch0 -p0 -b .dso
+autoreconf
 
 %build
 %configure
@@ -50,76 +43,40 @@ make %{?_smp_mflags}
 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 \
-  --add-category "Office" \
-  --add-category "Finance" \
-  --add-category "X-Fedora" \
-  %{SOURCE1}
+  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+cp -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/grisbi/grisbi.png \
+    $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/grisbi.png
 
-ln -s grisbi/grisbi.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/grisbi.png
 
 %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
+%find_lang %{name}-tips
+cat %{name}-tips.lang >> %{name}.lang
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING NEWS OLDNEWS README ABOUT-NLS
+%doc AUTHORS COPYING NEWS README ABOUT-NLS
 %attr(755,root,root) %{_bindir}/*
 %{_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
+%{_datadir}/icons/hicolor/48x48/apps/grisbi.png
+%{_datadir}/%{name}
+%{_datadir}/doc/%{name}
+%{_libdir}/%{name}
+%{_mandir}/man1/%{name}.1.*
+
 
 %changelog
+* Thu May 20 2010 Aurelien Bompard <abompard at fedoraproject.org> -  0.6.0-1
+- version 0.6.0
+
 * Wed May 05 2010 Aurelien Bompard <abompard at fedoraproject.org> -  0.5.9-11
 - Fix build without ld's implicit linking
   (http://fedoraproject.org/wiki/UnderstandingDSOLinkChange)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/grisbi/F-13/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	28 Sep 2006 08:26:48 -0000	1.7
+++ sources	21 May 2010 06:20:04 -0000	1.8
@@ -1 +1 @@
-040fd41c01b9075f84b7edb9b009bb67  grisbi-0.5.9.tar.bz2
+19062be7f4f6ec29adda4ec09f0d626f  grisbi-0.6.0.tar.bz2

