rpms/gnotime/devel gnotime-qof-0.7.patch, NONE, 1.1 gnotime.spec, 1.17, 1.18 gnotime-qof-0.6.patch, 1.1, NONE needs.rebuild, 1.1, NONE
Toshio Ernie Kuratomi (toshio)
fedora-extras-commits at redhat.com
Sun Sep 3 17:17:35 UTC 2006
Author: toshio
Update of /cvs/extras/rpms/gnotime/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8628
Modified Files:
gnotime.spec
Added Files:
gnotime-qof-0.7.patch
Removed Files:
gnotime-qof-0.6.patch needs.rebuild
Log Message:
- 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.
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/devel/gnotime.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gnotime.spec 17 May 2006 16:25:57 -0000 1.17
+++ gnotime.spec 3 Sep 2006 17:17:35 -0000 1.18
@@ -1,21 +1,22 @@
Name: gnotime
Version: 2.2.2
-Release: 5%{?dist}
+Release: 6%{?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
+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
@@ -43,15 +44,15 @@
%build
autoconf
-%configure
+%configure --disable-schemas-install
# Fix hardcoded rpath by using Fedora libtool
make LIBTOOL=/usr/bin/libtool
%install
rm -rf $RPM_BUILD_ROOT
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+#export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=$RPM_BUILD_ROOT
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+#unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
# Gnotime puts it's locale translations into gnotime-2.0.mo but it's gnome
# help files into html/gnotime....
@@ -108,6 +109,12 @@
%{_sysconfdir}/gconf/schemas/*
%changelog
+* 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.
--- gnotime-qof-0.6.patch DELETED ---
--- needs.rebuild DELETED ---
More information about the fedora-extras-commits
mailing list