1.1.90 release

svn: r4074

gramps2/Makefile.am

@@ -1,6 +1,6 @@
 SUBDIRS = src doc example
 
-EXTRA_DIST = autogen.sh gramps.spec.in COPYING-DOCS FAQ
+EXTRA_DIST = autogen.sh gramps.spec.in gramps.spec COPYING-DOCS FAQ
 
 bin_SCRIPTS = gramps
 distuninstallcheck_listfiles = find . -type -f -print | grep -E -v '/(globs|magic|XMLnamespaces)'

gramps2/configure.in

@@ -4,11 +4,11 @@ dnl Process this file with autoconf to produce a configure script.
 dnl May need to run automake && aclocal first
 
 AC_PREREQ(2.57)
-AC_INIT(gramps, 1.1.4, gramps-bugs@lists.sourceforge.net)
+AC_INIT(gramps, 1.1.90, gramps-bugs@lists.sourceforge.net)
 AC_CONFIG_SRCDIR(src/gramps.py)
 AM_INIT_AUTOMAKE(1.6.3)
-RELEASE=0.CVS$(head -c 10 ${srcdir}/ChangeLog | tr -d '-')
-dnl RELEASE=1
+dnl RELEASE=0.CVS$(head -c 10 ${srcdir}/ChangeLog | tr -d '-')
+RELEASE=1
 
 VERSIONSTRING=$VERSION
 if test x"$RELEASE" != "x"
@@ -47,9 +47,9 @@ AC_SUBST(POFILES)
 AC_SUBST(MOFILES)
 
 dnl Checks for programs.  
-dnl We first only check for python >= 2.2
+dnl We first only check for python >= 2.3
 
-AM_PATH_PYTHON(2.2)
+AM_PATH_PYTHON(2.3)
 AC_PATH_PROG(BINSH, sh)
 
 pygtk_require="

gramps2/gramps.spec.in

@@ -1,29 +1,21 @@
-%define fdr_release %(fdr_release="`rpm -q --queryformat='%{VERSION}' fedora-release | grep -v install 2>/dev/null`" ; if test $? != 0 ; then fdr_release="0" ; fi ; echo "$fdr_release")
-%define mdk_release %(mdk_release="`rpm -q --queryformat='%{VERSION}' mandrake-release | grep -v install 2>/dev/null`" ; if test $? != 0 ; then mdk_release="0" ; fi ; echo "$mdk_release")
-
 %define ver      @VERSION@
 %define rel      @RELEASE@
-
 %define prefix   /usr
 %define localstatedir /var/lib
-# Ensure that internal RPM macros for configure & makeinstall 
-# will expand properly
 %define _prefix   %prefix
 %define _localstatedir %localstatedir
 
 Summary: Genealogical Research and Analysis Management Programming System.
 Name: gramps
-Version: %ver
+Version: %{ver}
 License: GPL
 Group: Applications/Genealogy
 Source: http://download.sourceforge.net/gramps/gramps-%{ver}.tar.gz
 BuildRoot: /var/tmp/%{name}-%{version}-root
-
 URL: http://gramps.sourceforge.net/
+Release: %{rel}fdr3
+Distribution: Fedora Core 3
 
-%if %{fdr_release}
-Release:	%{rel}fdr%(dist_release="`echo "%{fdr_release} * 1" | bc 2>/dev/null`" ; echo "$dist_release")
-Distribution:	Fedora Core %{fdr_release}
 Requires: python >= 2.3
 Requires: gnome-python2 >= 2.6.0
 Requires: gnome-python2-gconf >= 2.6.0
@@ -31,17 +23,6 @@ Requires: gnome-python2-canvas >= 2.6.0
 Requires: gnome-python2-gnomevfs >= 2.6.0
 Requires: pygtk2 >= 2.4.0
 Requires: pygtk2-libglade >= 2.4.0
-%else
-Release: 	%{rel}mdk%(mdkver="`awk '{split($4,a,\".\");printf(\"%d%d\",a[1],a[2]);}' /etc/mandrake-release`"; echo "$mdkver")
-Distribution:	Mandrake Linux %{mdk_release}
-Requires: python >= 2.3
-Requires: gnome-python >= 2.6.0
-Requires: gnome-python-gconf >= 2.6.0
-Requires: gnome-python-canvas >= 2.6.0
-Requires: gnome-python-gnomevfs >= 2.6.0
-Requires: pygtk2.0 >= 2.4.0
-Requires: pygtk2.0-libglade >= 2.4.0
-%endif
 
 BuildRequires: scrollkeeper >= @SCROLLKEEPER_BUILD_REQUIRED@
 BuildRequires: automake >= 1.6
@@ -111,7 +92,7 @@ GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
 /usr/bin/update-desktop-database %{_datadir}/applications &> /dev/null
 /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null
 if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
-pkill gconfd
+/usr/bin/pkill gconfd || /bin/true
 
 %postun
 if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi

gramps2/src/plugins/Makefile.am

@@ -30,6 +30,7 @@ pkgdata_PYTHON = \
 	IndivComplete.py\
 	IndivSummary.py\
 	Merge.py\
+	NavWebPage.py\
 	PatchNames.py\
 	ReadPkg.py\
 	ReadNative.py\