rpms/gramps/F-10 gramps-3.0.3-dbcrash.patch, NONE, 1.1 .cvsignore, 1.23, 1.24 gramps.spec, 1.38, 1.39 sources, 1.23, 1.24
Jeffrey C. Ollie
jcollie at fedoraproject.org
Sat Nov 22 01:45:11 UTC 2008
- Previous message (by thread): rpms/gramps/devel gramps-3.0.3-dbcrash.patch, NONE, 1.1 .cvsignore, 1.23, 1.24 gramps.spec, 1.38, 1.39 sources, 1.23, 1.24
- Next message (by thread): rpms/evince/devel evince.spec,1.139,1.140
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jcollie
Update of /cvs/pkgs/rpms/gramps/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27869
Modified Files:
.cvsignore gramps.spec sources
Added Files:
gramps-3.0.3-dbcrash.patch
Log Message:
* Thu Nov 20 2008 Russell Harrison <rharrison at fedoraproject.org> - 3.0.3-0
- Update to 3.0.3.
- Changed build arguments to "--enable-packager-mode" from "--disable-schemas-install --disable-scrollkeeper --disable-mime-install".
- Removed scrollkeeper commands and dependencies.
- Removed GCONF schema commands as schema files are no longer created by the build. pre and preun sections are no longer needed.
- Help files are now stored on the gramps wiki instead of created durring the build.
- Changed gnome-python2 dependency to gnome-python2-gnome for F10 and above per bug #460006
- Included a patch to allow gramps to work with BerkeleyDB 4.7 in F10
gramps-3.0.3-dbcrash.patch:
--- NEW FILE gramps-3.0.3-dbcrash.patch ---
--- src/gen/db/dbdir.py 2008/04/05 22:04:30 10487
+++ src/gen/db/dbdir.py 2008/11/13 08:07:59 11296
@@ -480,8 +480,13 @@
# These env settings are only needed for Txn environment
self.env.set_lk_max_locks(25000)
self.env.set_lk_max_objects(25000)
- self.env.set_flags(db.DB_LOG_AUTOREMOVE, 1) # clean up unused logs
-
+
+ if db.version() < (4, 7):
+ # Python 2.5 log settings
+ self.env.set_flags(db.DB_LOG_AUTOREMOVE, 1) # clean up unused logs
+ else:
+ # Python 2.6 log settings (db version 4.7.25)
+ self.env.set_flags(db.DB_LOG_AUTO_REMOVE, 1)
# The DB_PRIVATE flag must go if we ever move to multi-user setup
env_flags = db.DB_CREATE | db.DB_PRIVATE |\
db.DB_INIT_MPOOL | db.DB_INIT_LOCK |\
@@ -1556,7 +1561,8 @@
transaction = BdbTransaction(msg, self.undodb, batch, no_magic)
if transaction.batch:
self.env.txn_checkpoint()
- self.env.set_flags(db.DB_TXN_NOSYNC, 1) # async txn
+ if db.version() < (4, 7):
+ self.env.set_flags(db.DB_TXN_NOSYNC, 1) # async txn
if self.secondary_connected and not transaction.no_magic:
# Disconnect unneeded secondary indices
@@ -1594,7 +1600,8 @@
self.txn.commit()
if transaction.batch:
self.env.txn_checkpoint()
- self.env.set_flags(db.DB_TXN_NOSYNC, 0) # sync txn
+ if db.version() < (4, 7):
+ self.env.set_flags(db.DB_TXN_NOSYNC, 0) # sync txn
if not transaction.no_magic:
# create new secondary indices to replace the ones removed
@@ -1697,7 +1704,12 @@
# These env settings are only needed for Txn environment
self.env.set_lk_max_locks(25000)
self.env.set_lk_max_objects(25000)
- self.env.set_flags(db.DB_LOG_AUTOREMOVE, 1) # clean up unused logs
+ if db.version() < (4, 7):
+ # Python 2.5 log settings
+ self.env.set_flags(db.DB_LOG_AUTOREMOVE, 1) # clean up unused logs
+ else:
+ # Python 2.6 log settings (db version 4.7.25)
+ self.env.set_flags(db.DB_LOG_AUTO_REMOVE, 1)
# The DB_PRIVATE flag must go if we ever move to multi-user setup
env_flags = db.DB_CREATE | db.DB_PRIVATE |\
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gramps/F-10/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore 14 Jan 2008 16:32:31 -0000 1.23
+++ .cvsignore 22 Nov 2008 01:44:40 -0000 1.24
@@ -1 +1 @@
-gramps-2.2.10.tar.gz
+gramps-3.0.3.tar.gz
Index: gramps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gramps/F-10/gramps.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- gramps.spec 14 Jan 2008 16:32:31 -0000 1.38
+++ gramps.spec 22 Nov 2008 01:44:40 -0000 1.39
@@ -1,30 +1,39 @@
Name: gramps
-Version: 2.2.10
-Release: 1%{?dist}
+Version: 3.0.3
+Release: 0%{?dist}
Summary: Genealogical Research and Analysis Management Programming System
Group: Applications/Productivity
License: GPLv2+
URL: http://gramps.sourceforge.net/
Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch0: gramps-3.0.3-dbcrash.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: perl(XML::Parser)
+%if 0%{?fedora} >= 10
+BuildRequires: gnome-python2-gnome
+%endif
BuildRequires: gnome-python2-canvas
BuildRequires: gnome-python2-gconf
BuildRequires: gnome-vfs2-devel
+BuildRequires: intltool
BuildRequires: pygtk2-libglade
BuildRequires: python-devel
-BuildRequires: scrollkeeper
BuildRequires: gnome-doc-utils
Requires: gnome-python2-canvas
Requires: gnome-python2-gconf
Requires: gnome-python2-gnomevfs
-Requires: gnome-python2
+%if 0%{?fedora} < 10
+BuildRequires: gnome-python2
+%endif
+%if 0%{?fedora} >= 10
+BuildRequires: gnome-python2-gnome
+%endif
Requires: gnome-python2-gnomeprint
Requires: gnome-python2-gtkspell
Requires: ImageMagick
@@ -37,12 +46,9 @@
Requires(pre): GConf2
Requires(post): desktop-file-utils
-Requires(post): scrollkeeper
Requires(post): GConf2
Requires(preun): GConf2
Requires(postun): desktop-file-utils
-Requires(postun): scrollkeeper
-
%description
gramps (Genealogical Research and Analysis Management Programming
@@ -52,10 +58,10 @@
%prep
%setup -q
-
+%patch0
%build
-%configure --disable-schemas-install --disable-scrollkeeper --disable-mime-install
+%configure --enable-packager-mode
make
@@ -74,24 +80,10 @@
--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
-
%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 \
- %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
-fi
-
-
%post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule \
- %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
-scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
update-desktop-database &> /dev/null ||:
update-mime-database %{_datadir}/mime &> /dev/null || :
touch --no-create %{_datadir}/icons/hicolor || :
@@ -99,17 +91,7 @@
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
-
-%preun
-if [ "$1" -eq 0 ]; then
- export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
- gconftool-2 --makefile-uninstall-rule \
- %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
-fi
-
-
%postun
-scrollkeeper-update -q || :
update-desktop-database &> /dev/null ||:
update-mime-database %{_datadir}/mime &> /dev/null || :
touch --no-create %{_datadir}/icons/hicolor || :
@@ -120,24 +102,29 @@
%files -f %{name}.lang
%defattr(-,root,root,-)
-%doc AUTHORS COPYING COPYING-DOCS FAQ NEWS TODO
+%doc AUTHORS COPYING FAQ NEWS TODO
%{_bindir}/%{name}
%{_datadir}/%{name}/
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/application-registry/%{name}.applications
-%{_datadir}/omf/%{name}/
%{_datadir}/mime/packages/%{name}.xml
%{_datadir}/mime-info/*
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%{_datadir}/icons/gnome/48x48/mimetypes/*.png
%{_datadir}/icons/gnome/scalable/mimetypes/*.svg
%{_datadir}/pixmaps/%{name}.png
-%{_sysconfdir}/gconf/schemas/%{name}.schemas
%{_mandir}/man1/%{name}.1.gz
-%{_datadir}/gnome/help/%{name}/
-
%changelog
+* Thu Nov 20 2008 Russell Harrison <rharrison at fedoraproject.org> - 3.0.3-0
+- Update to 3.0.3.
+- Changed build arguments to "--enable-packager-mode" from "--disable-schemas-install --disable-scrollkeeper --disable-mime-install".
+- Removed scrollkeeper commands and dependencies.
+- Removed GCONF schema commands as schema files are no longer created by the build. pre and preun sections are no longer needed.
+- Help files are now stored on the gramps wiki instead of created durring the build.
+- Changed gnome-python2 dependency to gnome-python2-gnome for F10 and above per bug #460006
+- Included a patch to allow gramps to work with BerkeleyDB 4.7 in F10
+
* Mon Jan 14 2008 Brian Pepple <bpepple at fedoraproject.org> - 2.2.10-1
- Update to 2.2.10.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gramps/F-10/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources 14 Jan 2008 16:32:31 -0000 1.23
+++ sources 22 Nov 2008 01:44:40 -0000 1.24
@@ -1 +1 @@
-19fd44347642d09c202932aa618ee4f5 gramps-2.2.10.tar.gz
+fd8657124fff8f520c50ce513b2c94c9 gramps-3.0.3.tar.gz
- Previous message (by thread): rpms/gramps/devel gramps-3.0.3-dbcrash.patch, NONE, 1.1 .cvsignore, 1.23, 1.24 gramps.spec, 1.38, 1.39 sources, 1.23, 1.24
- Next message (by thread): rpms/evince/devel evince.spec,1.139,1.140
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list