rpms/gnumeric/devel gnumeric-1.6.1-desktop.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 gnumeric.spec, 1.9, 1.10 sources, 1.2, 1.3 gnumeric-1.4.1-desktop.patch, 1.1, NONE gnumeric-1.4.3-libgsf.patch, 1.1, NONE

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	.cvsignore gnumeric.spec sources 
Added Files:
	gnumeric-1.6.1-desktop.patch 
Removed Files:
	gnumeric-1.4.1-desktop.patch gnumeric-1.4.3-libgsf.patch 
Log Message:
New upstream release 1.6.1 (WIP)

gnumeric-1.6.1-desktop.patch:

--- NEW FILE gnumeric-1.6.1-desktop.patch ---
--- gnumeric-1.6.1/Makefile.in.desktop	2005-11-14 07:18:15.000000000 +0100
+++ gnumeric-1.6.1/Makefile.in	2005-11-26 22:53:14.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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnumeric/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Mar 2005 12:17:13 -0000	1.2
+++ .cvsignore	27 Nov 2005 20:43:00 -0000	1.3
@@ -1 +1 @@
-gnumeric-1.4.3.tar.bz2
+gnumeric-1.6.1.tar.bz2


Index: gnumeric.spec
===================================================================
RCS file: /cvs/extras/rpms/gnumeric/devel/gnumeric.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gnumeric.spec	18 Oct 2005 19:25:49 -0000	1.9
+++ gnumeric.spec	27 Nov 2005 20:43:00 -0000	1.10
@@ -3,8 +3,8 @@
 
 Summary:        A spreadsheet program for GNOME.
 Name:     	gnumeric
-Version: 	1.4.3
-Release: 	7
+Version: 	1.6.1
+Release: 	1
 Epoch:		1
 License:	GPL
 Group:		Applications/Productivity
@@ -12,27 +12,24 @@
 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.12
+Requires:       libgnomeui >= 2.8.2
+Requires:       libgnomeprintui22 >= 2.8.2
+Requires:       gtk2 >= 2.6.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:  libgnomeprintui22-devel >= 2.8.2
 BuildRequires:  python-devel
-BuildRequires:  libgsf-devel >= 1.12
+BuildRequires:  libgsf113-devel >= 1.13.2
 BuildRequires:  automake autoconf libtool
 BuildRequires:  intltool scrollkeeper gettext
 BuildRequires:  libgnomedb-devel >= 1.0.4
-BuildRequires:  pango-devel >= 1.4.0
 BuildRequires:  pygtk2-devel >= 2.6.0
-Patch0: gnumeric-1.4.1-desktop.patch
+BuildRequires:  goffice >= 0.1.2
+BuildRequires:  guile-devel
+Patch0: gnumeric-1.6.1-desktop.patch
 Patch1: gnumeric-1.4.1-excelcrash.patch
-Patch2: gnumeric-1.4.1-configure.patch
-Patch3: gnumeric-1.4.3-libgsf.patch
 
 %description
 Gnumeric is a spreadsheet program for the GNOME GUI desktop
@@ -52,13 +49,12 @@
 %setup -q
 %patch0 -p1 -b .desktop
 %patch1 -p1 -b .excelcrash
-%patch2 -p1 -b .configure
-%patch3 -p1 -b .libgsf
 
 %build
 libtoolize --force --copy && aclocal && autoconf
 export mllibname=%{_lib}
-%configure --without-gb --without-guile
+export PKG_CONFIG_PATH=%{_libdir}/libgsf-1.13/lib/pkgconfig
+%configure --without-gb
 
 OLD_PO_FILE_INPUT=yes make
 
@@ -143,7 +139,9 @@
 %dir %{_libdir}/gnumeric/%{gnumeric_version}
 
 %changelog
-* Unreleased, Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.4.3-7
+* Sat Nov 26 2005 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.1-1
+- new upstream stable version 1.6.1
+- drop 2 integrated patches
 - own dirs /usr/share/mc/templates /usr/share/mc (bug 169332)
 
 * Thu Aug 18 2005 Jeremy Katz <katzj at redhat.com> - 1:1.4.3-6


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnumeric/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Mar 2005 12:17:13 -0000	1.2
+++ sources	27 Nov 2005 20:43:00 -0000	1.3
@@ -1 +1 @@
-b684eec48b1696d7a8d7152d1e17741c  gnumeric-1.4.3.tar.bz2
+e6f769e4e74c29ffea0305d48691fe28  gnumeric-1.6.1.tar.bz2


--- gnumeric-1.4.1-desktop.patch DELETED ---


--- gnumeric-1.4.3-libgsf.patch DELETED ---