[gramps] Add gtkspell3 dependency, BZ 983064 Add libgexiv2-python2 dependency, BZ 983071 Patch for AttributeE

Jon Ciesla limb at fedoraproject.org
Wed Jul 10 12:55:14 UTC 2013


commit 48e6e4e2abf376938c89f4e082faaff37a323c17
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Wed Jul 10 07:49:54 2013 -0500

    Add gtkspell3 dependency, BZ 983064
    Add libgexiv2-python2 dependency, BZ 983071
    Patch for AttributeError, BZ 982250.

 gramps-4.0.1-6807_b.patch |   42 ++++++++++++++++++++++++++++++++++++++++++
 gramps.spec               |   13 +++++++++++--
 2 files changed, 53 insertions(+), 2 deletions(-)
---
diff --git a/gramps-4.0.1-6807_b.patch b/gramps-4.0.1-6807_b.patch
new file mode 100644
index 0000000..e75f5e3
--- /dev/null
+++ b/gramps-4.0.1-6807_b.patch
@@ -0,0 +1,42 @@
+Index: gramps/gui/widgets/validatedmaskedentry.py
+===================================================================
+--- gramps/gui/widgets/validatedmaskedentry.py	(revision 22568)
++++ gramps/gui/widgets/validatedmaskedentry.py	(working copy)
+@@ -235,6 +235,7 @@
+     __gtype_name__ = 'MaskedEntry'
+ 
+     def __init__(self):
++        self._block_changed = False
+         UndoableEntry.__init__(self)
+ 
+         # connect in UndoableEntry:
+@@ -253,7 +254,6 @@
+ 
+         self._completion = None
+         self._exact_completion = False
+-        self._block_changed = False
+         self.hasicon = False
+ ##        self._icon = IconEntry(self)
+ 
+@@ -1157,10 +1157,10 @@
+         self.data_type = None
+         self.mandatory = False
+         self.error_icon = error_icon
++        self._block_changed = False
+ 
+         MaskedEntry.__init__(self)
+         
+-        self._block_changed = False
+         self._valid = True
+         self._def_error_msg = None
+         self._fade = FadeOut(self, err_color)
+@@ -1171,7 +1171,8 @@
+ 
+     # Virtual methods
+     def do_changed(self):
+-        if self._block_changed:
++        block_changed = getattr(self, '_block_changed', True)
++        if block_changed:
+             self.emit_stop_by_name('changed')
+             return
+         self.emit('content-changed')
diff --git a/gramps.spec b/gramps.spec
index 40c9fce..b43a9f5 100644
--- a/gramps.spec
+++ b/gramps.spec
@@ -2,7 +2,7 @@
 #global		_beta 2
 Name:           gramps
 Version:        4.0.1
-Release:        1%{?_beta:.beta%{_beta}}%{?dist}
+Release:        2%{?_beta:.beta%{_beta}}%{?dist}
 Summary:        Genealogical Research and Analysis Management Programming System
 
 Group:          Applications/Productivity
@@ -10,6 +10,7 @@ License:        GPLv2+
 URL:            http://gramps-project.org/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{?_beta:-0beta%{_beta}}.tar.gz
 Source1:	resource-path
+Patch0:		gramps-4.0.1-6807_b.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
@@ -36,7 +37,8 @@ Requires:       rcs
 Requires:	graphviz
 Requires:	python-osmgpsmap
 Requires:	pyicu
-Requires:	gtkspell
+Requires:	gtkspell3
+Requires:	libgexiv2-python2
 
 Requires:	gnu-free-serif-fonts
 Requires:	gnu-free-mono-fonts
@@ -57,6 +59,8 @@ based plugin system.
 %prep
 %setup -q
 
+%patch0 -p0 -b .6807b
+
 %build
 %{__python} setup.py build
 
@@ -127,6 +131,11 @@ fi
 
 %changelog
 * Mon Jul 08 2013 Jon Ciesla <limburgher at gmail.com> - 4.0.1-1
+- Add gtkspell3 dependency, BZ 983064
+- Add libgexiv2-python2 dependency, BZ 983071
+- Patch for AttributeError, BZ 982250.
+
+* Mon Jul 08 2013 Jon Ciesla <limburgher at gmail.com> - 4.0.1-1
 - 4.0.1.
 
 * Thu May 30 2013 Jon Ciesla <limburgher at gmail.com> - 4.0.0-1


More information about the scm-commits mailing list