rpms/gnumeric/devel gnumeric-1.8.1-gnomedb-vercheck.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 gnumeric.spec, 1.35, 1.36 gnumeric-1.4.1-excelcrash.patch, 1.1, NONE gnumeric-1.6.3-gda3.patch, 1.2, NONE gnumeric-1.6.3-gpl-md5.patch, 1.1, NONE gnumeric-1.6.3-helppath.patch, 1.1, NONE gnumeric-1.6.3-stf-parse.patch, 1.1, NONE

Hans de Goede (jwrdegoede) fedora-extras-commits at redhat.com
Fri Jan 25 23:15:03 UTC 2008 

Author: jwrdegoede

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

Modified Files:
	.cvsignore gnumeric.spec 
Added Files:
	gnumeric-1.8.1-gnomedb-vercheck.patch 
Removed Files:
	gnumeric-1.4.1-excelcrash.patch gnumeric-1.6.3-gda3.patch 
	gnumeric-1.6.3-gpl-md5.patch gnumeric-1.6.3-helppath.patch 
	gnumeric-1.6.3-stf-parse.patch 
Log Message:
* 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
- Split of perl and libgda/libgnomedb plugins into gnumeric-plugins-extras


gnumeric-1.8.1-gnomedb-vercheck.patch:

--- NEW FILE gnumeric-1.8.1-gnomedb-vercheck.patch ---
diff -up gnumeric-1.8.1/configure.in~ gnumeric-1.8.1/configure.in
--- gnumeric-1.8.1/configure.in~	2008-01-25 21:43:09.000000000 +0100
+++ gnumeric-1.8.1/configure.in	2008-01-25 21:43:09.000000000 +0100
@@ -429,7 +429,7 @@ if test "$try_gda" = "true"; then
 		[gda_msg=yes],
 		[gda_msg="NO.  libgda problem"])
 	if test "$gda_msg" = "yes"; then
-		PKG_CHECK_MODULES(GNOMEDB, [libgnomedb-3.0 >= 3.0.1],
+		PKG_CHECK_MODULES(GNOMEDB, [libgnomedb-3.0 >= 3.0.0],
 			[gnomedb_msg="yes"],
 			[gnomedb_msg="NO. libgnomedb problem"])
 		if test "$gnomedb_msg" = "yes"; then
diff -up gnumeric-1.8.1/configure~ gnumeric-1.8.1/configure
--- gnumeric-1.8.1/configure~	2008-01-25 21:43:04.000000000 +0100
+++ gnumeric-1.8.1/configure	2008-01-25 21:43:04.000000000 +0100
@@ -23352,12 +23352,12 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_GNOMEDB_CFLAGS="$GNOMEDB_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomedb-3.0 >= 3.0.1\"") >&5
-  ($PKG_CONFIG --exists --print-errors "libgnomedb-3.0 >= 3.0.1") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomedb-3.0 >= 3.0.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "libgnomedb-3.0 >= 3.0.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_GNOMEDB_CFLAGS=`$PKG_CONFIG --cflags "libgnomedb-3.0 >= 3.0.1" 2>/dev/null`
+  pkg_cv_GNOMEDB_CFLAGS=`$PKG_CONFIG --cflags "libgnomedb-3.0 >= 3.0.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -23370,12 +23370,12 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_GNOMEDB_LIBS="$GNOMEDB_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomedb-3.0 >= 3.0.1\"") >&5
-  ($PKG_CONFIG --exists --print-errors "libgnomedb-3.0 >= 3.0.1") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomedb-3.0 >= 3.0.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "libgnomedb-3.0 >= 3.0.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_GNOMEDB_LIBS=`$PKG_CONFIG --libs "libgnomedb-3.0 >= 3.0.1" 2>/dev/null`
+  pkg_cv_GNOMEDB_LIBS=`$PKG_CONFIG --libs "libgnomedb-3.0 >= 3.0.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -23394,9 +23394,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GNOMEDB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgnomedb-3.0 >= 3.0.1"`
+	        GNOMEDB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgnomedb-3.0 >= 3.0.0"`
         else
-	        GNOMEDB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomedb-3.0 >= 3.0.1"`
+	        GNOMEDB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomedb-3.0 >= 3.0.0"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GNOMEDB_PKG_ERRORS" >&5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnumeric/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	6 May 2006 07:53:57 -0000	1.5
+++ .cvsignore	25 Jan 2008 23:14:28 -0000	1.6
@@ -1 +1 @@
-gnumeric-1.6.3.tar.bz2
+gnumeric-1.8.1.tar.bz2


Index: gnumeric.spec
===================================================================
RCS file: /cvs/extras/rpms/gnumeric/devel/gnumeric.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- gnumeric.spec	25 Jan 2008 16:29:18 -0000	1.35
+++ gnumeric.spec	25 Jan 2008 23:14:28 -0000	1.36
@@ -10,15 +10,16 @@
 URL:              http://www.gnome.org/gnumeric/
 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.8.1-gnomedb-vercheck.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.6.1
 BuildRequires:    python-devel guile-devel perl(XML::Parser) scrollkeeper
-BuildRequires:    gettext desktop-file-utils
+BuildRequires:    gettext desktop-file-utils perl(ExtUtils::Embed)
 Requires:         scrollkeeper hicolor-icon-theme
 Requires(pre):    GConf2
 Requires(post):   /sbin/ldconfig GConf2 scrollkeeper
@@ -34,6 +35,7 @@
 Summary: Files necessary to develop gnumeric-based applications
 Group: Development/Libraries
 Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: pkgconfig
 
 %description devel
 Gnumeric is a spreadsheet program for the GNOME GUI desktop
@@ -41,13 +43,28 @@
 develop gnumeric-based applications.
 
 
+%package plugins-extras
+Summary:          Files necessary to develop gnumeric-based applications
+Group:            Applications/Productivity
+Requires:         %{name} = %{epoch}:%{version}-%{release}
+
+%description plugins-extras
+This package contains the following additional plugins for gnumeric:
+* gda and gnomedb plugins:
+  Database functions for retrieval of data from a database.
+* perl plugin:
+  This plugin allows writing of plugins in perl
+
+
 %prep
 %setup -q
 %patch0 -p1 -b .desktop
+%patch1 -p1
+chmod -x plugins/excel/rc4.?
 
 
 %build
-%configure --without-gb --enable-ssindex
+%configure --enable-ssindex
 # Don't use rpath!
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -90,9 +107,6 @@
 rm $RPM_BUILD_ROOT/%{_libdir}/libspreadsheet.la
 rm $RPM_BUILD_ROOT/%{_libdir}/%{name}/%{version}/plugins/*/*.la
 
-#remove bogus mc stuff
-rm -r $RPM_BUILD_ROOT/%{_datadir}/mc
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -143,13 +157,15 @@
 %{_libdir}/libspreadsheet-%{version}.so
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/%{version}
-%{_libdir}/bonobo/servers/GNOME_Gnumeric.server
+%exclude %{_libdir}/%{name}/%{version}/include
+%exclude %{_libdir}/%{name}/%{version}/plugins/perl-*
+%exclude %{_libdir}/%{name}/%{version}/plugins/gdaif
+%exclude %{_libdir}/%{name}/%{version}/plugins/gnome-db
 %{_datadir}/pixmaps/%{name}
 %{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/%{version}
 %exclude %{_datadir}/%{name}/%{version}/idl
-%{_datadir}/mime-info
 %{_datadir}/applications/fedora-%{name}.desktop
 # The actual omf file is in gnumeric.lang, but find-lang doesn't own the dir!
 %dir %{_datadir}/omf/%{name}
@@ -159,11 +175,21 @@
 %defattr(-,root,root)
 %{_datadir}/%{name}/%{version}/idl
 %{_libdir}/libspreadsheet.so
+%{_libdir}/pkgconfig/libspreadsheet-1.8.pc
+%{_includedir}/libspreadsheet-1.8
+%{_libdir}/%{name}/%{version}/include
+
+%files plugins-extras
+%defattr(-,root,root,-)
+%{_libdir}/%{name}/%{version}/plugins/perl-*
+%{_libdir}/%{name}/%{version}/plugins/gdaif
+%{_libdir}/%{name}/%{version}/plugins/gnome-db
 
 
 %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
+- Split of perl and libgda/libgnomedb plugins into gnumeric-plugins-extras
 
 * 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)


--- gnumeric-1.4.1-excelcrash.patch DELETED ---


--- gnumeric-1.6.3-gda3.patch DELETED ---


--- gnumeric-1.6.3-gpl-md5.patch DELETED ---


--- gnumeric-1.6.3-helppath.patch DELETED ---


--- gnumeric-1.6.3-stf-parse.patch DELETED ---

More information about the fedora-extras-commits mailing list