rpms/gnumeric/devel gnumeric-1.6.1-desktop.patch, 1.2, 1.3 gnumeric.spec, 1.34, 1.35 sources, 1.5, 1.6

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/gnumeric/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22147

Modified Files:
	gnumeric-1.6.1-desktop.patch gnumeric.spec sources 
Log Message:
gnumeric 1.8.1 WIP

gnumeric-1.6.1-desktop.patch:

Index: gnumeric-1.6.1-desktop.patch
===================================================================
RCS file: /cvs/extras/rpms/gnumeric/devel/gnumeric-1.6.1-desktop.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnumeric-1.6.1-desktop.patch	30 Nov 2005 15:19:12 -0000	1.2
+++ gnumeric-1.6.1-desktop.patch	25 Jan 2008 16:29:18 -0000	1.3
@@ -1,37 +1,3 @@
---- gnumeric-1.6.1/Makefile.in.desktop	2005-11-14 07:18:15.000000000 +0100
-+++ gnumeric-1.6.1/Makefile.in	2005-11-30 09:31:13.000000000 +0100
-@@ -344,18 +344,17 @@
- gnew_in_files = gnumeric.desktop.in
- 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 = \
- 	README HACKING NEWS BEVERAGES BUGS MAINTAINERS AUTHORS $(change_logs)	\
- 	gnumeric.desktop.in	\
--	gnumeric.keys.in	\
- 	gnumeric.mime		\
- 	gnumeric.spec		\
- 	gnumeric.xsd		\
-@@ -902,10 +901,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) $(POFILES_FULL)
- 	 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.6.1/gnumeric.desktop.in.desktop	2005-11-30 09:31:53.000000000 +0100
 +++ gnumeric-1.6.1/gnumeric.desktop.in	2005-11-30 09:31:53.000000000 +0100
 @@ -4,7 +4,7 @@


Index: gnumeric.spec
===================================================================
RCS file: /cvs/extras/rpms/gnumeric/devel/gnumeric.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- gnumeric.spec	15 Nov 2007 21:52:50 -0000	1.34
+++ gnumeric.spec	25 Jan 2008 16:29:18 -0000	1.35
@@ -1,27 +1,22 @@
 Name:             gnumeric
 Epoch:            1
-Version:          1.6.3
-Release:          13%{?dist}
+Version:          1.8.1
+Release:          1%{?dist}
 Summary:          Spreadsheet program for GNOME
 Group:            Applications/Productivity
 # bug filed upstream about this being GPL v2 only:
 # http://bugzilla.gnome.org/show_bug.cgi?id=463247
 License:          GPLv2
 URL:              http://www.gnome.org/gnumeric/
-Source:           ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.6/%{name}-%{version}.tar.bz2
+Source:           ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.8/%{name}-%{version}.tar.bz2
 Patch0:           gnumeric-1.6.1-desktop.patch
-Patch1:           gnumeric-1.4.1-excelcrash.patch
-Patch2:           gnumeric-1.6.3-helppath.patch
-Patch3:           gnumeric-1.6.3-gda3.patch
-Patch4:           gnumeric-1.6.3-gpl-md5.patch
-Patch5:           gnumeric-1.6.3-stf-parse.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-root
 BuildRequires:    libgnomeui-devel >= 2.4.0
 BuildRequires:    libgnomeprintui22-devel >= 2.8.2
 BuildRequires:    libgsf-gnome-devel >= 1.13.2
 BuildRequires:    libgnomedb-devel >= 3.0.0
 BuildRequires:    pygtk2-devel >= 2.6.0
-BuildRequires:    goffice-devel >= 0.2.0
+# BuildRequires:    goffice-devel >= 0.2.0
 BuildRequires:    python-devel guile-devel perl(XML::Parser) scrollkeeper
 BuildRequires:    gettext desktop-file-utils
 Requires:         scrollkeeper hicolor-icon-theme
@@ -49,12 +44,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .desktop
-%patch1 -p1 -b .excelcrash
-%patch2 -p1 -b .helppath
-%patch3 -p1 -b .gda3
-%patch4 -p1 -b .gpl-md5
-%patch5 -p1 -b .csv
-chmod -x plugins/excel/rc4.?
 
 
 %build
@@ -173,6 +162,9 @@
 
 
 %changelog
+* Fri Jan 25 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.8.1-1
+- New upstream release 1.8.1
+
 * Thu Nov 15 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.3-13
 - Fix opening of csv files in non-English locales (bz 385441)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnumeric/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 May 2006 07:53:57 -0000	1.5
+++ sources	25 Jan 2008 16:29:18 -0000	1.6
@@ -1 +1 @@
-78ffd75ae6abc3bb20dd04407a082a26  gnumeric-1.6.3.tar.bz2
+a80ae52484b07d772297dcde6c0dab47  gnumeric-1.8.1.tar.bz2