rpms/gnumeric/devel gnumeric-1.6.3-gda3.patch, 1.1, 1.2 gnumeric.spec, 1.29, 1.30
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Wed Aug 22 11:39:41 UTC 2007
Author: jwrdegoede
Update of /cvs/extras/rpms/gnumeric/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25574
Modified Files:
gnumeric-1.6.3-gda3.patch gnumeric.spec
Log Message:
* Mon Aug 6 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.3-10
- Update License tag for new Licensing Guidelines compliance
- Don't regenerate all the autoxxx stuff (not needed) this fixes building with
the latest intltool
gnumeric-1.6.3-gda3.patch:
Index: gnumeric-1.6.3-gda3.patch
===================================================================
RCS file: /cvs/extras/rpms/gnumeric/devel/gnumeric-1.6.3-gda3.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnumeric-1.6.3-gda3.patch 28 May 2007 07:41:47 -0000 1.1
+++ gnumeric-1.6.3-gda3.patch 22 Aug 2007 11:39:38 -0000 1.2
@@ -1,3 +1,93 @@
+--- gnumeric-1.6.3/configure.orig 2007-08-22 13:08:26.000000000 +0200
++++ gnumeric-1.6.3/configure 2007-08-22 13:08:26.000000000 +0200
+@@ -22088,12 +22088,12 @@ if test -n "$PKG_CONFIG"; then
+ pkg_cv_GDA_CFLAGS="$GDA_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgda-2.0 >= 1.3.0\"") >&5
+- ($PKG_CONFIG --exists --print-errors "libgda-2.0 >= 1.3.0") 2>&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgda-3.0 >= 1.3.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgda-3.0 >= 1.3.0") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_GDA_CFLAGS=`$PKG_CONFIG --cflags "libgda-2.0 >= 1.3.0" 2>/dev/null`
++ pkg_cv_GDA_CFLAGS=`$PKG_CONFIG --cflags "libgda-3.0 >= 1.3.0" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -22106,12 +22106,12 @@ if test -n "$PKG_CONFIG"; then
+ pkg_cv_GDA_LIBS="$GDA_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgda-2.0 >= 1.3.0\"") >&5
+- ($PKG_CONFIG --exists --print-errors "libgda-2.0 >= 1.3.0") 2>&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgda-3.0 >= 1.3.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgda-3.0 >= 1.3.0") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_GDA_LIBS=`$PKG_CONFIG --libs "libgda-2.0 >= 1.3.0" 2>/dev/null`
++ pkg_cv_GDA_LIBS=`$PKG_CONFIG --libs "libgda-3.0 >= 1.3.0" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -22130,9 +22130,9 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- GDA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgda-2.0 >= 1.3.0"`
++ GDA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgda-3.0 >= 1.3.0"`
+ else
+- GDA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgda-2.0 >= 1.3.0"`
++ GDA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgda-3.0 >= 1.3.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GDA_PKG_ERRORS" >&5
+@@ -22158,12 +22158,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-2.0 >= 1.3.0\"") >&5
+- ($PKG_CONFIG --exists --print-errors "libgnomedb-2.0 >= 1.3.0") 2>&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomedb-3.0 >= 1.3.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgnomedb-3.0 >= 1.3.0") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_GNOMEDB_CFLAGS=`$PKG_CONFIG --cflags "libgnomedb-2.0 >= 1.3.0" 2>/dev/null`
++ pkg_cv_GNOMEDB_CFLAGS=`$PKG_CONFIG --cflags "libgnomedb-3.0 >= 1.3.0" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -22176,12 +22176,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-2.0 >= 1.3.0\"") >&5
+- ($PKG_CONFIG --exists --print-errors "libgnomedb-2.0 >= 1.3.0") 2>&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomedb-3.0 >= 1.3.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgnomedb-3.0 >= 1.3.0") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_GNOMEDB_LIBS=`$PKG_CONFIG --libs "libgnomedb-2.0 >= 1.3.0" 2>/dev/null`
++ pkg_cv_GNOMEDB_LIBS=`$PKG_CONFIG --libs "libgnomedb-3.0 >= 1.3.0" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -22200,9 +22200,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-2.0 >= 1.3.0"`
++ GNOMEDB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgnomedb-3.0 >= 1.3.0"`
+ else
+- GNOMEDB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomedb-2.0 >= 1.3.0"`
++ GNOMEDB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomedb-3.0 >= 1.3.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GNOMEDB_PKG_ERRORS" >&5
--- gnumeric-1.6.3/configure.in.orig 2007-05-01 18:21:36.000000000 -0400
+++ gnumeric-1.6.3/configure.in 2007-05-01 18:22:54.000000000 -0400
@@ -369,11 +369,11 @@
Index: gnumeric.spec
===================================================================
RCS file: /cvs/extras/rpms/gnumeric/devel/gnumeric.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gnumeric.spec 8 Aug 2007 08:01:24 -0000 1.29
+++ gnumeric.spec 22 Aug 2007 11:39:38 -0000 1.30
@@ -14,17 +14,14 @@
Patch2: gnumeric-1.6.3-helppath.patch
Patch3: gnumeric-1.6.3-gda3.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: desktop-file-utils >= 0.9
BuildRequires: libgnomeui-devel >= 2.4.0
BuildRequires: libgnomeprintui22-devel >= 2.8.2
-BuildRequires: python-devel
BuildRequires: libgsf-gnome-devel >= 1.13.2
-BuildRequires: automake autoconf libtool
-BuildRequires: intltool scrollkeeper gettext
BuildRequires: libgnomedb-devel >= 3.0.0
BuildRequires: pygtk2-devel >= 2.6.0
BuildRequires: goffice-devel >= 0.2.0
-BuildRequires: guile-devel
+BuildRequires: python-devel guile-devel perl(XML::Parser) scrollkeeper
+BuildRequires: gettext desktop-file-utils
Requires: scrollkeeper hicolor-icon-theme
Requires(pre): GConf2
Requires(post): /sbin/ldconfig GConf2 scrollkeeper
@@ -57,10 +54,8 @@
%build
-libtoolize --force --copy && aclocal && autoconf
-export mllibname=%{_lib}
%configure --without-gb --enable-ssindex
-OLD_PO_FILE_INPUT=yes make
+make %{?_smp_mflags}
%install
@@ -172,6 +167,8 @@
%changelog
* Mon Aug 6 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.3-10
- Update License tag for new Licensing Guidelines compliance
+- Don't regenerate all the autoxxx stuff (not needed) this fixes building with
+ the latest intltool
* Sun Jun 10 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.3-9
- Remove yelp Requires again <sigh> (bz 243361)
More information about the fedora-extras-commits
mailing list