rpms/gnotime/FC-5 gnotime-qof-0.7.patch, NONE, 1.1 gnotime.spec, 1.16, 1.17 gnotime-qof-0.6.patch, 1.1, NONE

Mon Sep 4 03:23:23 UTC 2006

Author: toshio

Update of /cvs/extras/rpms/gnotime/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16675

Modified Files:
	gnotime.spec 
Added Files:
	gnotime-qof-0.7.patch 
Removed Files:
	gnotime-qof-0.6.patch 
Log Message:
- Remove testing of --disable-schemas-install which will not work until a
  patch makes it upstream.
- Add intltool as a BR.
- Rebuild against qof-0.7.  Change the patch to also link against the qof
  deprecated.h header as gnotime is now using deprecated, gnc-date functions.
- Remove the libXt fake BR: as it shouldn't be needed on FC5+.
- Attempt rebuild for new guile.



gnotime-qof-0.7.patch:

--- NEW FILE gnotime-qof-0.7.patch ---
Index: gnotime-2.2.2/configure.in
===================================================================
--- gnotime-2.2.2.orig/configure.in
+++ gnotime-2.2.2/configure.in
@@ -52,7 +52,6 @@ LIBXML2_REQUIRED=2.0.0
 SCROLLKEEPER_BUILD_REQUIRED=0.3.5
 dnl Doesn't compile w/ qof-0.5.0
 LIBQOF_REQUIRED_MIN=0.6.0
-LIBQOF_REQUIRED_MAX=0.6.0
 
 
 dnl *******************************
@@ -169,7 +168,7 @@ AC_HELP_STRING([--with-system-qof],
 
 [
 if test x$withval = "xyes"; then
-	PKG_CHECK_MODULES(LIBQOF, qof-1 >= $LIBQOF_REQUIRED_MIN qof-1 <= $LIBQOF_REQUIRED_MAX)
+	PKG_CHECK_MODULES(LIBQOF, qof-1 >= $LIBQOF_REQUIRED_MIN)
 	qofbuild=no
 else
 	dnl Have to use static libqof instead of dynamic.
@@ -180,8 +179,8 @@ else
 fi
 ],
 [
-if $PKG_CONFIG --exists "qof-1 >= $LIBQOF_REQUIRED_MIN qof-1 <= $LIBQOF_REQUIRED_MAX"; then
-	PKG_CHECK_MODULES(LIBQOF, qof-1 >= $LIBQOF_REQUIRED_MIN qof-1 <= $LIBQOF_REQUIRED_MAX)
+if $PKG_CONFIG --exists "qof-1 >= $LIBQOF_REQUIRED_MIN"; then
+	PKG_CHECK_MODULES(LIBQOF, qof-1 >= $LIBQOF_REQUIRED_MIN)
 	qofbuild=no
 else
 	dnl Have to use static libqof instead of dynamic
Index: gnotime-2.2.2/src/active-dialog.c
===================================================================
--- gnotime-2.2.2.orig/src/active-dialog.c
+++ gnotime-2.2.2/src/active-dialog.c
@@ -22,7 +22,7 @@
 #include <gnome.h>
 #include <string.h>
 
-#include <qof/gnc-date.h>
+#include <qof/deprecated.h>
 
 #include "ctree.h"
 #include "ctree-gnome2.h"
Index: gnotime-2.2.2/src/app.c
===================================================================
--- gnotime-2.2.2.orig/src/app.c
+++ gnotime-2.2.2/src/app.c
@@ -27,7 +27,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <qof/gnc-date.h>
+#include <qof/deprecated.h>
 
 #include "active-dialog.h"
 #include "app.h"
Index: gnotime-2.2.2/src/ctree.c
===================================================================
--- gnotime-2.2.2.orig/src/ctree.c
+++ gnotime-2.2.2/src/ctree.c
@@ -22,7 +22,7 @@
 #include <config.h>
 #include <gnome.h>
 
-#include <qof/gnc-date.h>
+#include <qof/deprecated.h>
 
 #include "app.h"
 #include "ctree.h"
Index: gnotime-2.2.2/src/ghtml-deprecated.c
===================================================================
--- gnotime-2.2.2.orig/src/ghtml-deprecated.c
+++ gnotime-2.2.2/src/ghtml-deprecated.c
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <qof/gnc-date.h>
+#include <qof/deprecated.h>
 
 #include "app.h"
 #include "ctree.h"
Index: gnotime-2.2.2/src/idle-dialog.c
===================================================================
--- gnotime-2.2.2.orig/src/idle-dialog.c
+++ gnotime-2.2.2/src/idle-dialog.c
@@ -22,7 +22,7 @@
 #include <gnome.h>
 #include <string.h>
 
-#include <qof/gnc-date.h>
+#include <qof/deprecated.h>
 
 #include "ctree.h"
 #include "ctree-gnome2.h"


Index: gnotime.spec
===================================================================
RCS file: /cvs/extras/rpms/gnotime/FC-5/gnotime.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gnotime.spec	13 Feb 2006 20:23:42 -0000	1.16
+++ gnotime.spec	4 Sep 2006 03:23:23 -0000	1.17
@@ -1,24 +1,22 @@
 Name:           gnotime
 Version:        2.2.2
-Release:        4%{?dist}
+Release:        7%{?dist}
 Summary:        Tracks and reports time spent
 
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://gttr.sourceforge.net/
 Source0:        http://dl.sf.net/gttr/%{name}-%{version}.tar.gz
-Patch0:		gnotime-qof-0.6.patch
+Patch0:         gnotime-qof-0.7.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtkhtml3-devel
 BuildRequires:  guile-devel >= 1.6.0
 BuildRequires:  scrollkeeper
 BuildRequires:  gettext
+BuildRequires:  intltool
 BuildRequires:  desktop-file-utils
-BuildRequires:  qof-devel >= 0.6.0
-# libxt-devel is required to work around autoconf brokenness.  Remove when fixed
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=176379
-BuildRequires:  libXt-devel
+BuildRequires:  qof-devel >= 0.7.0
 # Patch0 modifies configure.in so we need autoconf
 BuildRequires: autoconf
 # To get rid of rpath, we need to use a fedora libtool
@@ -46,6 +44,9 @@
 
 %build
 autoconf
+# Test that the next release of gnotime can build with --disable-schemas-install
+# That should allow us to get rid of the GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+# stuff.
 %configure
 # Fix hardcoded rpath by using Fedora libtool
 make LIBTOOL=/usr/bin/libtool
@@ -111,6 +112,20 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Sun Sep 03 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.2-7
+- Remove testing of --disable-schemas-install which will not work until a
+  patch makes it upstream.
+
+* Fri Sep 01 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.2-6
+- Rebuild for FC6.
+- Add intltool as a BR.
+- Rebuild against qof-0.7.  Change the patch to also link against the qof
+  deprecated.h header as gnotime is now using deprecated, gnc-date functions.
+
+* Fri May 12 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.2-5
+- Remove the libXt fake BR: as it shouldn't be needed on FC5+.
+- Attempt rebuild for new guile.
+
 * Mon Feb 13 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.2-4
 - Bump and rebuild for FC5.
 


--- gnotime-qof-0.6.patch DELETED ---


