devel/gnotime gnotime-gtkhtml3.6-qof.patch, NONE, 1.1 gnotime.spec, 1.4, 1.5 gnotime-gtkhtml3-qof.patch, 1.1, NONE
Toshio Ernie Kuratomi (toshio)
fedora-extras-commits at redhat.com
Thu Mar 31 03:04:06 UTC 2005
Author: toshio
Update of /cvs/extras/devel/gnotime
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25712
Modified Files:
gnotime.spec
Added Files:
gnotime-gtkhtml3.6-qof.patch
Removed Files:
gnotime-gtkhtml3-qof.patch
Log Message:
* Fix scriptlets for gconf schema install/uninstall.
* Fix gtkhtml3 detection so 3.6 is detected.
gnotime-gtkhtml3.6-qof.patch:
--- NEW FILE gnotime-gtkhtml3.6-qof.patch ---
Index: configure.in
===================================================================
RCS file: /cvsroot/gttr/gnotime/configure.in,v
retrieving revision 1.44
diff -u -r1.44 configure.in
--- configure.in 23 May 2004 21:15:00 -0000 1.44
+++ configure.in 20 Jul 2004 18:36:02 -0000
@@ -50,6 +50,8 @@
LIBGTKHTML_REQUIRED=3.0.0
LIBXML2_REQUIRED=2.0.0
SCROLLKEEPER_BUILD_REQUIRED=0.3.5
+LIBQOF_REQUIRED_MIN=0.5.0
+LIBQOF_REQUIRED_MAX=0.5.0
dnl *******************************
dnl Guile checks
@@ -167,7 +169,12 @@
dnl gtkhtml
dnl *******************************
-PKG_CHECK_MODULES(LIBGTKHTML, libgtkhtml-3.1 >= $LIBGTKHTML_REQUIRED)
+for GTKHTMLVER in 3.6 3.5 3.4 3.2 3.1 3.0; do
+ if $PKG_CONFIG --exists libgtkhtml-$GTKHTMLVER; then
+ PKG_CHECK_MODULES(LIBGTKHTML, libgtkhtml-$GTKHTMLVER >= $LIBGTKHTML_REQUIRED)
+ break
+ fi
+done
AC_SUBST(LIBGTKHTML_CFLAGS)
AC_SUBST(LIBGTKHTML_LIBS)
@@ -182,6 +189,42 @@
AC_SUBST(LIBXML2_LIBS)
dnl *****************************
+dnl libqof
+dnl *****************************
+
+AC_ARG_WITH(system-qof,
+AC_HELP_STRING([--with-system-qof],
+[use installed libqof rather than the bundled one. If not specified, configure will use the system qof if installed, otherwise its own.]),
+
+[
+if test x$withval = "xyes"; then
+ PKG_CHECK_MODULES(LIBQOF, qof-0 >= $LIBQOF_REQUIRED_MIN qof-0 <= $LIBQOF_REQUIRED_MAX)
+ qofbuild=no
+else
+ AC_MSG_NOTICE([Using internal libqof])
+ LIBQOF_CFLAGS='-I$(top_srcdir)/lib -I$(top_srcdir)/lib/qof'
+ LIBQOF_LIBS='$(top_builddir)/lib/qof/libqof.la $(top_builddir)/lib/libqofsql/libqofsql.la'
+ qofbuild=yes
+fi
+],
+[
+if $PKG_CONFIG --exists "qof-0 >= $LIBQOF_REQUIRED_MIN qof-0 <= $LIBQOF_REQUIRED_MAX"; then
+ PKG_CHECK_MODULES(LIBQOF, qof-0 >= $LIBQOF_REQUIRED_MIN qof-0 <= $LIBQOF_REQUIRED_MAX)
+ qofbuild=no
+else
+ AC_MSG_NOTICE([Using internal libqof])
+ LIBQOF_CFLAGS='-I$(top_srcdir)/lib -I$(top_srcdir)/lib/qof'
+ LIBQOF_LIBS='$(top_builddir)/lib/qof/libqof.la $(top_builddir)/lib/libqofsql/libqofsql.la'
+ qofbuild=yes
+fi
+])
+
+AM_CONDITIONAL(QOFBUILD, test x$qofbuild = xyes)
+
+AC_SUBST(LIBQOF_CFLAGS)
+AC_SUBST(LIBQOF_LIBS)
+
+dnl *****************************
dnl scrollkeeper
dnl *****************************
dnl To substitute into the gnotime.spec
Index: src/Makefile.am
===================================================================
RCS file: /cvsroot/gttr/gnotime/src/Makefile.am,v
retrieving revision 1.28
--- src/Makefile.am 24 Apr 2004 00:39:56 -0000 1.28
+++ src/Makefile.am 20 Jul 2004 18:36:02 -0000
@@ -91,11 +91,10 @@
${LIBGNOMEVFS_CFLAGS} \
${LIBGTKHTML_CFLAGS} \
${LIBGLADE_CFLAGS} \
+ ${LIBQOF_CFLAGS} \
${LIBXML2_CFLAGS}
INCLUDES = \
- -I../lib \
- -I../lib/qof \
-I$(includedir) \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DGTTGLADEDIR=\""$(datadir)/gnotime"\" \
@@ -109,8 +108,7 @@
gnotime_LDADD = \
$(GNOTIME_LIBS) \
- ../lib/qof/libqof.la \
- ../lib/libqofsql/libqofsql.la \
+ $(LIBQOF_LIBS) \
$(LIBGLADE_LIBS) \
$(LIBGTKHTML_LIBS) \
${LIBGNOMEVFS_LIBS} \
@@ -125,7 +123,3 @@
down.xpm \
left.xpm \
design.txt
-
-
-
-
Index: lib/libqofsql/Makefile.am
===================================================================
RCS file: /cvsroot/gttr/gnotime/lib/libqofsql/Makefile.am,v
retrieving revision 1.1
--- lib/libqofsql/Makefile.am 9 Apr 2004 04:58:52 -0000 1.1
+++ lib/libqofsql/Makefile.am 20 Jul 2004 18:36:02 -0000
@@ -1,6 +1,9 @@
## Process this file with automake to produce Makefile.in
+if QOFBUILD
lib_LTLIBRARIES = libqofsql.la
+noinst_PROGRAMS = sql_parse_test
+endif
libqofsql_la_SOURCES = \
parser.c \
@@ -15,9 +18,11 @@
sql_tree.h
qofsqlincludedir = ${pkgincludedir}
+if QOFBUILD
qofsqlinclude_HEADERS = sql_parser.h
-
-noinst_PROGRAMS = sql_parse_test
+else
+noinst_HEADERS = sql_parser.h
+endif
EXTRA_DIST = \
.cvsignore \
Index: lib/qof/Makefile.am
===================================================================
RCS file: /cvsroot/gttr/gnotime/lib/qof/Makefile.am,v
retrieving revision 1.7
--- lib/qof/Makefile.am 3 May 2004 03:46:59 -0000 1.7
+++ lib/qof/Makefile.am 20 Jul 2004 18:36:03 -0000
@@ -1,7 +1,8 @@
# pkglib_LTLIBRARIES = libqof.la
-
+if QOFBUILD
lib_LTLIBRARIES = libqof.la
+endif
libqof_la_SOURCES = \
gnc-date.c \
@@ -28,7 +29,7 @@
qofsql.c
qofincludedir = ${pkgincludedir}
-qofinclude_HEADERS = \
+public_headers = \
gnc-date.h \
gnc-engine-util.h \
gnc-numeric.h \
@@ -67,7 +68,14 @@
qofquerycore-p.h \
qofsession-p.h
-
+if QOFBUILD
+qofinclude_HEADERS = \
+ $(public_headers)
+else
+noinst_HEADERS += \
+ $(public_headers)
+endif
+
EXTRA_DIST = \
README \
.cvsignore
@@ -83,6 +91,3 @@
-I$(includedir) \
-DPREFIX=\""$(prefix)"\" \
-DDATADIR=\""$(datadir)"\"
-
-
-
Index: gnotime.spec
===================================================================
RCS file: /cvs/extras/devel/gnotime/gnotime.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnotime.spec 5 Mar 2005 21:10:21 -0000 1.4
+++ gnotime.spec 31 Mar 2005 03:04:04 -0000 1.5
@@ -1,6 +1,6 @@
Name: gnotime
Version: 2.2.1
-Release: 5
+Release: 6
Summary: Tracks and reports time spent
Group: Applications/Productivity
@@ -14,7 +14,7 @@
Patch0: http://www.tiki-lounge.com/~toshio/fedora/gnotime-desktop.patch
# Combined patch allowing builds with gtkhtml3.0 or 3.1 and
# builds with a libqof installed on the system instead of bundled with Gnotime.
-Patch1: http://www.tiki-lounge.com/~toshio/fedora/gnotime-gtkhtml3-qof.patch
+Patch1: http://www.tiki-lounge.com/~toshio/fedora/gnotime-gtkhtml3.6-qof.patch
# Fixes includes of qof headers in source files.
Patch2: http://www.tiki-lounge.com/~toshio/fedora/gnotime-qof-include.patch
# Fixes the idle timer for kernel 2.6.
@@ -100,16 +100,34 @@
%clean
rm -rf $RPM_BUILD_ROOT
+%pre
+if [ "$1" -gt 1 ]; then
+ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+ gconftool-2 --makefile-uninstall-rule \
+ %{_syscondir}/gconf/schemas/gnotime.schemas &> /dev/null || :
+ # If applicable:
+ # gconftool-2 --makefile-uninstall-rule \
+ # %{_sysconfdir}/gconf/schemas/OLDSCHEMA.schemas &> /dev/null || :
+ killall -HUP gconfd-2 || :
+ unset GCONF_CONFIG_SOURCE
+fi
+
%post
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
-unset GCONF_CONFIG_SOURCES
+gconftool-2 --makefile-install-rule \
+ %{_sysconfdir}/gconf/schemas/gnotime.schemas &>/dev/null || :
+unset GCONF_CONFIG_SOURCE
+killall -HUP gconfd-2 || :
scrollkeeper-update -q -o %{_datadir}/omf/gnotime || :
%preun
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
-unset GCONF_CONFIG_SOURCE
+if [ "$1" -eq 0 ]; then
+ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+ gconftool-2 --makefile-uninstall-rule \
+ %{_sysconfdir}/gconf/schemas/gnotime.schemas &> /dev/null || :
+ unset GCONF_CONFIG_SOURCE
+ killall -HUP gconfd-2 || :
+fi
%postun
scrollkeeper-update -q || :
@@ -125,6 +143,12 @@
%{_sysconfdir}/gconf/schemas/*
%changelog
+* Sat Mar 19 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.1-6
+- Rebuild for FC4t1
+- Fix up scriptlets to properly install and uninstall gconf schemas via
+ gconftool-2.
+- Fix gtkhtml3 detection so 3.6 (as used in FC4) is detected.
+
* Sat Nov 27 2004 Toshio Kuratomi <toshio-tiki-lounge.com> - 0:2.2.1-5
- Patch to fix a crash when invoking gnome_help.
- Patch to wordwrap diary notes.
--- gnotime-gtkhtml3-qof.patch DELETED ---
More information about the fedora-extras-commits
mailing list