rpms/gnotime/F-8 gnotime-install-scripts.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 gnotime-gtkhtml315.patch, 1.1, 1.2 gnotime.spec, 1.23, 1.24 sources, 1.3, 1.4 gnotime-qof-0.7.patch, 1.3, NONE
Toshio くらとみ (toshio)
fedora-extras-commits at redhat.com
Mon Oct 29 04:29:10 UTC 2007
Author: toshio
Update of /cvs/pkgs/rpms/gnotime/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29615
Modified Files:
.cvsignore gnotime-gtkhtml315.patch gnotime.spec sources
Added Files:
gnotime-install-scripts.patch
Removed Files:
gnotime-qof-0.7.patch
Log Message:
* Fri Oct 26 2007 Toshio Kuratomi <toshio at fedoraproject.org> - 2.2.3-1
- Upstream bugfix release.
gnotime-install-scripts.patch:
--- NEW FILE gnotime-install-scripts.patch ---
diff -up gnotime-2.2.3/scripts/Makefile.am.bak gnotime-2.2.3/scripts/Makefile.am
--- gnotime-2.2.3/scripts/Makefile.am.bak 2007-10-27 11:22:06.000000000 -0700
+++ gnotime-2.2.3/scripts/Makefile.am 2007-10-27 11:23:18.000000000 -0700
@@ -1,7 +1,2 @@
-scriptsdir = $(prefix)/bin
-
-scripts_DATA = \
+dist_bin_SCRIPTS = \
gnotime-remote
-
-EXTRA_DIST = \
- $(scripts_DATA)
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnotime/F-8/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 17 Jan 2006 17:49:46 -0000 1.3
+++ .cvsignore 29 Oct 2007 04:28:37 -0000 1.4
@@ -1 +1 @@
-gnotime-2.2.2.tar.gz
+gnotime-2.2.3.tar.gz
gnotime-gtkhtml315.patch:
Index: gnotime-gtkhtml315.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnotime/F-8/gnotime-gtkhtml315.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnotime-gtkhtml315.patch 28 Aug 2007 06:39:38 -0000 1.1
+++ gnotime-gtkhtml315.patch 29 Oct 2007 04:28:37 -0000 1.2
@@ -1,6 +1,8 @@
---- gnotime-2.2.2/configure.in.gtkhtml 2007-08-13 19:15:57.000000000 -0700
-+++ gnotime-2.2.2/configure.in 2007-08-13 19:16:27.000000000 -0700
-@@ -211,7 +211,7 @@ dnl gtkhtml -- ask pkgconfig for some va
+Index: gnotime-2.2.3/configure.in
+===================================================================
+--- gnotime-2.2.3.orig/configure.in
++++ gnotime-2.2.3/configure.in
+@@ -192,7 +192,7 @@ dnl gtkhtml -- ask pkgconfig for some va
dnl *******************************
GTKHTMLPRESENT=no
Index: gnotime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnotime/F-8/gnotime.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gnotime.spec 30 Aug 2007 08:16:53 -0000 1.23
+++ gnotime.spec 29 Oct 2007 04:28:37 -0000 1.24
@@ -1,14 +1,16 @@
Name: gnotime
-Version: 2.2.2
-Release: 10%{?dist}
+Version: 2.2.3
+Release: 1%{?dist}
Summary: Tracks and reports time spent
Group: Applications/Productivity
License: GPLv2+
URL: http://gttr.sourceforge.net/
-Source0: http://dl.sf.net/gttr/%{name}-%{version}.tar.gz
-Patch0: gnotime-qof-0.7.patch
-Patch1: gnotime-gtkhtml315.patch
+Source0: http://downloads.sf.net/gttr/%{name}-%{version}.tar.gz
+Patch0: gnotime-gtkhtml315.patch
+# This changes a Makefile.am just to fix permissions on a script. Submitted
+# upstream but fixed in spec via chmod so we don't need automake.
+Patch1: gnotime-install-scripts.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtkhtml3-devel
@@ -20,8 +22,6 @@
BuildRequires: qof-devel >= 0.7.2
# 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
@@ -42,16 +42,14 @@
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%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
+%configure --disable-schemas-install
+make
%install
rm -rf $RPM_BUILD_ROOT
@@ -106,14 +104,16 @@
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README TODO
-%{_bindir}/*
+%attr(0755,root,root) %{_bindir}/*
%{_datadir}/%{name}
-%{_datadir}/omf/*
%{_datadir}/applications/fedora-%{name}.desktop
%{_mandir}/man[^3]/*
%{_sysconfdir}/gconf/schemas/*
%changelog
+* Fri Oct 26 2007 Toshio Kuratomi <toshio at fedoraproject.org> - 2.2.3-1
+- Upstream bugfix release.
+
* Wed Aug 29 2007 Toshio Kuratomi <toshio at fedoraproject.org> - 2.2.2-10
- Update qof patch for differences in how headers are included from each
other in qof-0.7.2.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnotime/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 17 Jan 2006 17:49:46 -0000 1.3
+++ sources 29 Oct 2007 04:28:37 -0000 1.4
@@ -1 +1 @@
-8c05509f57a278de03a97fae110de3f5 gnotime-2.2.2.tar.gz
+067c3579411cd98e0b18fec0b36475a6 gnotime-2.2.3.tar.gz
--- gnotime-qof-0.7.patch DELETED ---
More information about the scm-commits
mailing list