rpms/gnotime/devel gnotime-qof-0.6.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 gnotime.spec, 1.12, 1.13 sources, 1.2, 1.3 gnotime-desktop.patch, 1.1, NONE gnotime-gtkhtml3.8-qof.patch, 1.1, NONE gnotime-help-error.patch, 1.1, NONE gnotime-help.patch, 1.1, NONE gnotime-idle.patch, 1.1, NONE gnotime-popup-menus.patch, 1.1, NONE gnotime-qof-include.patch, 1.1, NONE gnotime-separate-timeouts.patch, 1.1, NONE gnotime-wordwrap.patch, 1.1, NONE gtt_restartwin.png, 1.1, NONE gtt_startprojwin.png, 1.1, NONE
Toshio Ernie Kuratomi (toshio)
fedora-extras-commits at redhat.com
Tue Jan 17 17:49:46 UTC 2006
Author: toshio
Update of /cvs/extras/rpms/gnotime/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25405
Modified Files:
.cvsignore gnotime.spec sources
Added Files:
gnotime-qof-0.6.patch
Removed Files:
gnotime-desktop.patch gnotime-gtkhtml3.8-qof.patch
gnotime-help-error.patch gnotime-help.patch gnotime-idle.patch
gnotime-popup-menus.patch gnotime-qof-include.patch
gnotime-separate-timeouts.patch gnotime-wordwrap.patch
gtt_restartwin.png gtt_startprojwin.png
Log Message:
* Sun Jan 15 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.2-1
- Rebuild against new qof-0.6.1.
- Patch to fix the build for the qof-0.6 series.
gnotime-qof-0.6.patch:
--- NEW FILE gnotime-qof-0.6.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: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnotime/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 16 Dec 2004 17:34:07 -0000 1.2
+++ .cvsignore 17 Jan 2006 17:49:46 -0000 1.3
@@ -1 +1 @@
-gnotime-2.2.1.tar.gz
+gnotime-2.2.2.tar.gz
Index: gnotime.spec
===================================================================
RCS file: /cvs/extras/rpms/gnotime/devel/gnotime.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gnotime.spec 18 Aug 2005 17:28:27 -0000 1.12
+++ gnotime.spec 17 Jan 2006 17:49:46 -0000 1.13
@@ -1,36 +1,13 @@
Name: gnotime
-Version: 2.2.1
-Release: 11%{?dist}
+Version: 2.2.2
+Release: 1%{?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
-# Images to go with the help files.
-Source1: http://www.tiki-lounge.com/~toshio/fedora/gtt_restartwin.png
-Source2: http://www.tiki-lounge.com/~toshio/fedora/gtt_startprojwin.png
-# Simple patch to make the .desktop more complete
-Patch0: http://www.tiki-lounge.com/~toshio/fedora/gnotime-desktop.patch
-# Combined patch allowing builds with gtkhtml3.0 through 3.8 and
-# builds with a libqof installed on the system instead of bundled with Gnotime.
-Patch1: http://www.tiki-lounge.com/~toshio/fedora/gnotime-gtkhtml3.8-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.
-Patch3: http://www.tiki-lounge.com/~toshio/fedora/gnotime-idle.patch
-# Fixes problems with calls to gnome_help
-Patch4: http://www.tiki-lounge.com/~toshio/fedora/gnotime-help.patch
-# Fixes problems with popup menus failing to pass data arguments to callbacks
-Patch5: http://www.tiki-lounge.com/~toshio/fedora/gnotime-popup-menus.patch
-# Fixes problem with gnome_help being invoked when the toplevel is unknown
-Patch6: http://www.tiki-lounge.com/~toshio/fedora/gnotime-help-error.patch
-# Add wordwrapping to textviews
-Patch7: http://www.tiki-lounge.com/~toshio/fedora/gnotime-wordwrap.patch
-# Adapt a patch from the gnotime issue tracker to separate the idle timeout
-# from the no project running timeout.
-Patch8: http://www.tiki-lounge.com/~toshio/fedora/gnotime-separate-timeouts.patch
-
+Patch0: gnotime-qof-0.6.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtkhtml3-devel
@@ -38,10 +15,11 @@
BuildRequires: scrollkeeper
BuildRequires: gettext
BuildRequires: desktop-file-utils
-BuildRequires: qof-devel >= 0.5.0
-BuildRequires: qof-devel < 0.6.0
-# Because we modify configure.in, we need to BR the auto* tools.
-BuildRequires: libtool
+BuildRequires: qof-devel >= 0.6.0
+# Patch0 modifies configure.in so we need autoconf
+BuildRequires: autoconf
+# To get rid of rpath, we need to use a fedora libtool
+BuildRequires: libtool
Requires(post): scrollkeeper
Requires(postun): scrollkeeper
@@ -61,30 +39,18 @@
%prep
%setup -q
-%patch0 -p0
-%patch1 -p1
-%patch2 -p0
-%patch3 -p0
-%patch4 -p0
-%patch5 -p0
-%patch6 -p0
-%patch7 -p0
-%patch8 -p1
-
-cp $RPM_SOURCE_DIR/gtt_restartwin.png $RPM_BUILD_DIR/%{name}-%{version}/doc/C/figures/
-cp $RPM_SOURCE_DIR/gtt_startprojwin.png $RPM_BUILD_DIR/%{name}-%{version}/doc/C/figures/
-
-# Copy the images to the correct position
+%patch0 -p1
%build
-autoreconf --install --force
-%GNUconfigure
-make
+autoconf
+%configure
+# 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
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
# Gnotime puts it's locale translations into gnotime-2.0.mo but it's gnome
@@ -110,9 +76,6 @@
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule \
%{_sysconfdir}/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
@@ -148,6 +111,17 @@
%{_sysconfdir}/gconf/schemas/*
%changelog
+* Sun Jan 15 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.2-1
+- Rebuild against new qof-0.6.1.
+- Patch to fix the build for the qof-0.6 series.
+
+* Fri Sep 30 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.2-0
+- Update to 2.2.2.
+- Remove all patches as they've been merged upstream.
+- Build with internal qof as gnotime now depends on 0.6.0 which has not yet
+ been released. Only build for devel/testing until we can use a released
+ version of qof.
+
* Thu Aug 18 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.1-11
- Fix the patch level on the new gtkhtml3 patch.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnotime/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 16 Dec 2004 17:34:07 -0000 1.2
+++ sources 17 Jan 2006 17:49:46 -0000 1.3
@@ -1 +1 @@
-e2aad191b62b41da7f2176a028f1aaf9 gnotime-2.2.1.tar.gz
+8c05509f57a278de03a97fae110de3f5 gnotime-2.2.2.tar.gz
--- gnotime-desktop.patch DELETED ---
--- gnotime-gtkhtml3.8-qof.patch DELETED ---
--- gnotime-help-error.patch DELETED ---
--- gnotime-help.patch DELETED ---
--- gnotime-idle.patch DELETED ---
--- gnotime-popup-menus.patch DELETED ---
--- gnotime-qof-include.patch DELETED ---
--- gnotime-separate-timeouts.patch DELETED ---
--- gnotime-wordwrap.patch DELETED ---
More information about the fedora-extras-commits
mailing list