rpms/gnumeric/devel gnumeric-1.4.1-configure.patch, NONE, 1.1 gnumeric-1.4.1-desktop.patch, NONE, 1.1 gnumeric-1.4.1-excelcrash.patch, NONE, 1.1 gnumeric.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Mon Mar 14 12:17:15 UTC 2005
Author: caolanm
Update of /cvs/extras/rpms/gnumeric/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19462/devel
Modified Files:
.cvsignore sources
Added Files:
gnumeric-1.4.1-configure.patch gnumeric-1.4.1-desktop.patch
gnumeric-1.4.1-excelcrash.patch gnumeric.spec
Log Message:
auto-import gnumeric-1.4.3-1 on branch devel from gnumeric-1.4.3-1.src.rpm
gnumeric-1.4.1-configure.patch:
--- NEW FILE gnumeric-1.4.1-configure.patch ---
--- gnumeric-1.4.1.orig/configure.in 2004-12-10 15:06:14.000000000 +0000
+++ gnumeric-1.4.1/configure.in 2004-12-15 13:54:19.899301960 +0000
@@ -708,7 +708,7 @@
dnl * Check for Perl
dnl **************************************************
dnl
-perl_msg=no
+perl_msg="yes"
AC_ARG_WITH(perl, [--{with,without}-perl Compile the Perl plugin loader])
AC_ARG_VAR(PERL, [The Perl executable.])
if test "x$with_perl" != xno; then
gnumeric-1.4.1-desktop.patch:
--- NEW FILE gnumeric-1.4.1-desktop.patch ---
--- gnumeric-1.4.1.orig/Makefile.in 2004-12-10 15:06:35.000000000 +0000
+++ gnumeric-1.4.1/Makefile.in 2004-12-15 13:05:38.887083537 +0000
@@ -310,20 +310,20 @@
gnew_DATA = gnumeric.desktop
Mimedir = $(datadir)/mime-info
-Mime_DATA = gnumeric.keys gnumeric.mime
+Mime_DATA = gnumeric.mime
@WITH_GNOME_TRUE at serverdir = $(libdir)/bonobo/servers/
@WITH_GNOME_TRUE at server_in_files = GNOME_Gnumeric.server.in
@WITH_GNOME_TRUE at server_DATA = GNOME_Gnumeric.server
CLEANFILES = $(server_DATA) $(server_in_files) \
- gnumeric.desktop gnumeric.keys
+ gnumeric.desktop
DISTCLEANFILES = intltool-extract intltool-merge intltool-update
EXTRA_DIST = \
gnumeric.desktop.in gnumeric.spec.in GNOME_Gnumeric.server.in.in\
- gnumeric.keys.in gnumeric.mime \
+ gnumeric.mime \
gnumeric.xsd \
README HACKING NEWS BEVERAGES BUGS MAINTAINERS AUTHORS $(change_logs) \
intltool-extract.in \
@@ -839,10 +839,6 @@
@INTLTOOL_SERVER_RULE@
-gnumeric.keys: gnumeric.keys.in Makefile
- sed -e 's^\@gnumeric_icondir\@^$(gnumeric_icondir)^g' < $(srcdir)/gnumeric.keys.in > gnumeric.keys.tmp \
- && mv gnumeric.keys.tmp gnumeric.keys
-
gnumeric.desktop: gnumeric.desktop.in Makefile $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po)
LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@.tmp
@WITH_GNOME_TRUE@ sed -e 's/F_OR_U/U/' <$@.tmp >$@.tmp2
gnumeric-1.4.1-excelcrash.patch:
--- NEW FILE gnumeric-1.4.1-excelcrash.patch ---
--- gnumeric-1.4.1.orig/plugins/excel/ms-excel-read.c 2004-11-28 05:27:04.000000000 +0000
+++ gnumeric-1.4.1/plugins/excel/ms-excel-read.c 2004-12-17 10:13:32.981467314 +0000
@@ -4119,6 +4119,8 @@
static void
excel_read_DIMENSIONS (BiffQuery *q, ExcelWorkbook *ewb)
{
+ if (!(q->length))
+ return;
GnmRange r;
if (ewb->container.ver >= MS_BIFF_V8) {
--- NEW FILE gnumeric.spec ---
%define gnumeric_version %{version}
%define desktop_file_utils_version 0.9
Summary: A spreadsheet program for GNOME.
Name: gnumeric
Version: 1.4.3
Release: 1
Epoch: 1
License: GPL
Group: Applications/Productivity
Source: ftp://ftp.gnome.org/pub/GNOME/sources/gnumeric/1.2/gnumeric-%{version}.tar.bz2
URL: http://www.gnome.org/gnumeric/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Requires: libgnomeui >= 2.4.0
Requires: libgnomeprintui22 >= 2.3.0
Requires: gtk2 >= 2.2.0
Requires: libgsf >= 1.10.0
#Requires: libgnomedb >= 1.0.4
PreReq: desktop-file-utils >= %{desktop_file_utils_version}
BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
BuildRequires: libgnomeui-devel >= 2.4.0
BuildRequires: libgnomeprintui22-devel >= 0.20
BuildRequires: libxml2-devel
BuildRequires: python-devel
BuildRequires: libgsf-devel >= 1.10.0
BuildRequires: automake autoconf libtool
BuildRequires: intltool scrollkeeper gettext desktop-file-utils
#BuildRequires: libgnomedb-devel >= 1.0.4
BuildRequires: pango-devel >= 1.4.0
Patch0: gnumeric-1.4.1-desktop.patch
Patch1: gnumeric-1.4.1-excelcrash.patch
Patch2: gnumeric-1.4.1-configure.patch
%description
Gnumeric is a spreadsheet program for the GNOME GUI desktop
environment.
%package devel
Summary: Files necessary to develop gnumeric-based applications.
Group: Development/Libraries
Requires: %{name} = %{epoch}:%{version}-%{release}
%description devel
Gnumeric is a spreadsheet program for the GNOME GUI desktop
environment. The gnumeric-devel package includes files necessary to
develop gnumeric-based applications.
%prep
%setup -q
%patch0 -p1 -b .desktop
%patch1 -p1 -b .excelcrash
%patch2 -p1 -b .configure
%build
libtoolize --force --copy && aclocal && autoconf
export mllibname=%{_lib}
%configure --without-gb --without-guile
OLD_PO_FILE_INPUT=yes make
%install
[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make DESTDIR=$RPM_BUILD_ROOT install
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
if [ -f /usr/lib/rpm/find-lang.sh ] ; then
/usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT %name
fi
./mkinstalldirs $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor gnome --delete-original \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--add-category X-Red-Hat-Extra \
--add-category Office \
--add-category Application \
--add-category Spreadsheet \
$RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
#remove spurious .ico thing
rm -rf $RPM_BUILD_ROOT/usr/share/pixmaps/win32-gnumeric.ico
#remove scrollkeeper stuff
rm -rf $RPM_BUILD_ROOT/var
%clean
rm -rf $RPM_BUILD_ROOT
%post
/sbin/ldconfig
update-desktop-database %{_datadir}/applications
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gnumeric*.schemas > /dev/null
%postun
/sbin/ldconfig
update-desktop-database %{_datadir}/applications
%files -f %{name}.lang
%defattr (0755, root, root)
%{_bindir}/*
%dir %{_libdir}/gnumeric
%dir %{_libdir}/gnumeric/%{gnumeric_version}
%{_libdir}/gnumeric/%{gnumeric_version}/plugins/*
# guile disabled due to 64-bit crash
## %{_datadir}/gnumeric/%{gnumeric_version}/guile
# FIXME - for s390 it builds some more with "--with-pic=-fPIC", but the
# grep for dlname then still fails.
%defattr (0644, root, root, 0755)
%doc HACKING AUTHORS ChangeLog NEWS BUGS README COPYING TODO
%{_datadir}/pixmaps/gnumeric
%{_datadir}/pixmaps/gnome-application-*.png
%{_datadir}/pixmaps/gnome-gnumeric.png
%dir %{_datadir}/gnumeric
%dir %{_datadir}/gnumeric/%{gnumeric_version}
%dir %{_libdir}/gnumeric/%{gnumeric_version}/plugins
%{_datadir}/gnumeric/%{gnumeric_version}/*
%{_datadir}/mime-info/gnumeric.mime
%{_datadir}/mc/templates/gnumeric.desktop
%{_datadir}/applications/*
%dir %{_datadir}/omf/gnumeric/
%{_datadir}/omf/gnumeric/*
%{_sysconfdir}/gconf/schemas/*.schemas
%{_libdir}/bonobo/servers/GNOME_Gnumeric.server
%{_mandir}/man1/*
%files devel
%defattr (-, root, root)
%dir %{_datadir}/gnumeric
%dir %{_datadir}/gnumeric/%{gnumeric_version}
%{_datadir}/gnumeric/%{gnumeric_version}/idl/*.idl
%dir %{_libdir}/gnumeric
%dir %{_libdir}/gnumeric/%{gnumeric_version}
%changelog
* Mon Mar 14 2005 Caolan McNamara <caolanm at redhat.com> 1.4.3-1
- bump to latest, first in extras
- drop helppath
* Fri Feb 18 2005 Caolan McNamara <caolanm at redhat.com> 1.4.2-3
- rh#149005#
* Mon Feb 7 2005 Matthias Clasen <mclasen at redhat.com> 1.4.2-2
- rebuild
* Thu Jan 27 2005 Caolan McNamara <caolanm at redhat.com> 1.4.2-1
- bump to next version
* Wed Dec 22 2004 Caolan McNamara <caolanm at redhat.com> 1.4.1-5
- RH#143587# pango-devel >= 1.4.0
* Sun Dec 19 2004 Caolan McNamara <caolanm at redhat.com> 1.4.1-4
- libgsf must be >= 1.10.0
* Fri Dec 17 2004 Caolan McNamara <caolanm at redhat.com> 1.4.1-3
- dubious "lib" usage from 64bit POV
* Thu Dec 17 2004 Caolan McNamara <caolanm at redhat.com> 1.4.1-2
- RH#143161# crash on reading corrupt excel file
* Wed Dec 15 2004 Caolan McNamara <caolanm at redhat.com> 1.4.1-1
- bump to new version
- drop integrated 64bit patch
- drop integrated desktop.in patch
- drop integrated latex patch
- drop disable bonobo patch
- add enable perl configure patch
- add quickfix for help being searched for in wrong place #gnome161404#
* Tue Nov 02 2004 Caolan McNamara <caolanm at redhat.com> 1.2.13-9
- #rh137694# backport latex exporter fix
- #rh137692# backport x64 excel fix
* Sat Oct 30 2004 Caolan McNamara <caolanm at redhat.com> 1.2.13-7
- #rh137565# Requires libgnomedb
* Thu Sep 30 2004 Christopher Aillon <caillon at redhat.com> 1.2.13-6
- Change Requires(post) to PreReq
* Thu Sep 30 2004 Caolan McNamara <caolanm at redhat.com> 1.2.13-5
- #rh134250# improve Requires: desktop-file-utils
* Thu Sep 30 2004 Caolan McNamara <caolanm at redhat.com> 1.2.13-4
- #rh134175# invalid mime type entry
* Mon Sep 27 2004 Caolan McNamara <caolanm at redhat.com> 1.2.13-3
- make a wild stab at #rh133662#
* Mon Sep 6 2004 Caolan McNamara <caolanm at redhat.com> 1.2.13-2
- update .keys to .desktop
* Tue Jul 27 2004 Caolan McNamara <caolanm at redhat.com> 1.2.13
- update to 1.2.13
- #107278# --without-bonobo, help is fairly nonfunctional otherwise
* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Wed May 5 2004 Caolan McNamara <caolanm at redhat.com> 1.2.12
- update to 1.2.12 some exported excel workbooks will not work in Excel
with older versions
_ delete unused patches
* Tue Apr 13 2004 Warren Togami <wtogami at redhat.com> 1.2.8-2
- #74034 own plugin dir
- #111112 BR intltool scrollkeeper gettext desktop-file-utils
- some cleanup
* Fri Apr 2 2004 Mark McLoughlin <markmc at redhat.com> 1.2.8-1
- Update to 1.2.8
* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Fri Feb 6 2004 Daniel Reed <dreed at redhat.com> 1:1.2.6-1
- Version bump (1.2.6)
* Tue Oct 14 2003 Jonathan Blandford <jrb at redhat.com> 1:1.2.1-2
- add ssconvert
* Tue Oct 14 2003 Havoc Pennington <hp at redhat.com> 1:1.2.1-1
- add %post to install schemas
- 1.2.1
* Fri Sep 19 2003 Havoc Pennington <hp at redhat.com> 1:1.2.0-1
- 1.2.0 final
* Mon Aug 25 2003 Jonathan Blandford <jrb at redhat.com>
- new version for GNOME 2.4
* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Tue Apr 29 2003 Tim Powers <timp at redhat.com> 1:1.0.12-5
- rebuild to fix broken libgal dep
* Tue Feb 18 2003 Elliot Lee <sopwith at redhat.com> 1:1.0.12-4
- Put in a fix for the no-python-on-lib64 problem.
* Wed Feb 12 2003 Havoc Pennington <hp at redhat.com> 1:1.0.12-3
- add --without-guile due to crash on 64-bit #82977
* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt
* Thu Jan 9 2003 Havoc Pennington <hp at redhat.com>
- 1.0.12
- remove libtoolize/autotools invocations, dunno why they were there
* Mon Dec 16 2002 Elliot Lee <sopwith at redhat.com> 1.0.9-6
- Run libtool/auto*
- Rebuild
* Thu Dec 05 2002 Florian La Roche <Florian.LaRoche at redhat.de>
- also disable python for mainframe, this should be fixed properly
at some point...
- add guile to filelist
* Wed Nov 6 2002 Bill Nottingham <notting at redhat.com> 1.0.9-4
- rebuild everywhere
- no python on hammer ATM
* Thu Oct 24 2002 Jeremy Katz <katzj at redhat.com>
- rebuild against new gal
- fixup file lists to use correct macros and include all files
* Fri Aug 2 2002 Havoc Pennington <hp at redhat.com>
- desktop file fixage
* Fri Jul 26 2002 Akira TAGOH <tagoh at redhat.com> 1.0.9-1
- update to 1.0.9
- gnumeric-0.67-excel95-ja.patch: we no longer need it. removed. (Bug#62776)
* Fri Jul 12 2002 Havoc Pennington <hp at redhat.com>
- update to 1.0.8
- remove exceljpfonts patch that no longer applies
* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
- automated rebuild
* Thu May 23 2002 Tim Powers <timp at redhat.com>
- automated rebuild
* Wed Apr 10 2002 Havoc Pennington <hp at redhat.com>
- add jp excel reading patch #62776
* Wed Mar 27 2002 Havoc Pennington <hp at redhat.com>
- add multibyte patch #61624
* Mon Mar 11 2002 Havoc Pennington <hp at redhat.com>
- 1.0.5
* Wed Jan 30 2002 Tim Powers <timp at redhat.com>
- update to 1.0.3
* Tue Nov 20 2001 Jonathan Blandford <jrb at redhat.com>
- Version 0.76
* Mon Oct 8 2001 Matt Wilson <msw at redhat.com>
- removed patch4 (gnumeric-0.67-sheet_corruption.patch), in CVS now.
- removed patch8 (gnumeric-0.67-xlsscale.patch), no longer needed.
- removed patch4 (gnumeric-0.67-s390.patch), no longer needed.
- regenerated patch6 (gnumeric-0.67.lengthen-warning.patch) against 0.71
- removed patch2 (gnumeric-0.67-mb.patch), in CVS now.
- removed patch9 (gnumeric-0.67-backspace.patch), came from CVS.
- removed patch5 (gnumeric-0.67-desktop.patch), ditto
- renamed remaining patches:
patch3 (gnumeric-0.67-excel95-ja.patch) -> patch2
patch6 (gnumeric-0.71-lengthen-warning.patch) -> patch3
- removed source10, ja.po from upstream is more up to date.
- added files needed for bonobo gnumeric back into file list
* Wed Sep 5 2001 Owen Taylor <otaylor at redhat.com>
- Add patch from CVS to fix backspace (#53062)
* Tue Aug 7 2001 Owen Taylor <otaylor at redhat.com>
- Fix problem with scaling percentage and XLS files (#51054)
- Fix problem where default font for ja and other locales was backwards
* Mon Aug 6 2001 Owen Taylor <otaylor at redhat.com>
- Install all files from the plugins in the main package. Putting .la
files in the main package didn't make sense, and we were missing
some files for the gnome-glossary package.
* Fri Aug 3 2001 Owen Taylor <otaylor at redhat.com>
- Add some missing directories to the main package (#50701)
* Tue Jul 31 2001 Than Ngo <than at redhat.com>
- add patch to build on s390, s390x
* Fri Jul 27 2001 Jonathan Blandford <jrb at redhat.com>
- change 'old copy' dialog to popup after 9 months
* Fri Jul 20 2001 Owen Taylor <otaylor at redhat.com>
- Add missing contents of .desktop file from CVS
* Thu Jul 19 2001 Owen Taylor <otaylor at redhat.com>
- Move desktop file to /etc/X11/applnk (#23488)
- Added BuildPrereq on python-devel (#45029)
- Add BuildPrereq on gal-devel (#45027)
- Add <locale.h> include to .mb patch
(don't know why it works for me / in the build system, #32388)
* Mon Jul 16 2001 Jonathan Blandford <jrb at redhat.com>
- backport sheet corruption fix
* Tue Jul 10 2001 Trond Eivind Glomsrød <teg at redhat.com>
- Make devel subpackage depend on main package
* Sat Jul 07 2001 Owen Taylor <otaylor at redhat.com>
- Version 0.67
* Fri Jun 15 2001 Nalin Dahyabhai <nalin at redhat.com>
- rebuild in new environment
* Thu Jun 07 2001 Florian La Roche <Florian.LaRoche at redhat.de>
- support newer gettext version
* Fri Mar 9 2001 Akira TAGOH <tagoh at redhat.com> 0.61-9
- Fixed read excel95's .xls for Japanese.
* Fri Feb 23 2001 Akira TAGOH <tagoh at rehdat.com> 0.61-8
- Fixed jp patch with gnome-print.
* Mon Feb 19 2001 Akira TAGOH <tagoh at redhat.com>
- Fixed jp patch.
* Thu Feb 08 2001 Yukihiro Nakai <ynakai at redhat.com>
- Fix about Japanese translation (ja.po)
* Wed Feb 07 2001 Yukihiro Nakai <ynakai at redhat.com>
- Update Japanese translation.
* Tue Feb 06 2001 Akira TAGOH <tagoh at redhat.com>
- Added Japanese patch.
- Updated Japanese translation.
Note: Please remove Source10 when the next upstream release.
* Thu Jan 18 2001 Matt Wilson <msw at redhat.com>
- don't use bin:bin for files in devel.
* Wed Jan 03 2001 Preston Brown <pbrown at redhat.com>
- standard file and directory modes/ownership
* Fri Dec 29 2000 Matt Wilson <msw at redhat.com>
- use rpm > 3.0.5 macros
- 0.61
* Fri Aug 11 2000 Jonathan Blandford <jrb at redhat.com>
- Up Epoch and release
* Tue Jul 18 2000 Owen Taylor <otaylor at redhat.com>
- Fix DocDir:
* Thu Jul 13 2000 Prospector <bugzilla at redhat.com>
- automatic rebuild
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnumeric/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 14 Mar 2005 12:15:55 -0000 1.1
+++ .cvsignore 14 Mar 2005 12:17:13 -0000 1.2
@@ -0,0 +1 @@
+gnumeric-1.4.3.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnumeric/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 14 Mar 2005 12:15:55 -0000 1.1
+++ sources 14 Mar 2005 12:17:13 -0000 1.2
@@ -0,0 +1 @@
+b684eec48b1696d7a8d7152d1e17741c gnumeric-1.4.3.tar.bz2
More information about the fedora-extras-commits
mailing list