rpms/pybliographer/FC-4 gnome-python.patch, NONE, 1.1 pybliographer.patch, 1.1, 1.2 pybliographer.spec, 1.9, 1.10
Zoltan Kota (zkota)
fedora-extras-commits at redhat.com
Tue Dec 20 14:11:15 UTC 2005
- Previous message (by thread): rpms/pybliographer/FC-3 pybliographer.patch, 1.1, 1.2 pybliographer.spec, 1.6, 1.7
- Next message (by thread): rpms/pybliographer/devel gnome-python.patch, NONE, 1.1 pybliographer.patch, 1.1, 1.2 pybliographer.spec, 1.10, 1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: zkota
Update of /cvs/extras/rpms/pybliographer/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10347/FC-4
Modified Files:
pybliographer.patch pybliographer.spec
Added Files:
gnome-python.patch
Log Message:
Applying patches from upstream
gnome-python.patch:
--- NEW FILE gnome-python.patch ---
--- pybliographer-1.2.7-orig/Pyblio/GnomeUI/Editor.py 2005-10-13 18:11:13.000000000 +0200
+++ pybliographer-1.2.7/Pyblio/GnomeUI/Editor.py 2005-12-19 13:36:35.000000000 +0100
@@ -352,24 +352,24 @@
if text != '':
try: day = int (text)
except ValueError:
- ui.gnome_error_dialog_parented (_("Invalid day field in date"),
- self.day.get_toplevel ())
+ ui.error_dialog_parented (_("Invalid day field in date"),
+ self.day.get_toplevel ())
return -1
text = string.strip (self.month.get_chars (0, -1)).encode ('latin-1')
if text != '':
try: month = int (text)
except ValueError, err:
- ui.gnome_error_dialog_parented (_("Invalid month field in date"),
- self.day.get_toplevel ())
+ ui.error_dialog_parented (_("Invalid month field in date"),
+ self.day.get_toplevel ())
return -1
text = string.strip (self.year.get_chars (0, -1)).encode ('latin-1')
if text != '':
try: year = int (text)
except ValueError:
- ui.gnome_error_dialog_parented (_("Invalid year field in date"),
- self.day.get_toplevel ())
+ ui.error_dialog_parented (_("Invalid year field in date"),
+ self.day.get_toplevel ())
return -1
if self.initial == (day, month, year): return 0
@@ -381,8 +381,8 @@
try:
entry [self.field] = Fields.Date ((year, month, day))
except Exceptions.DateError, error:
- ui.gnome_error_dialog_parented (str (error),
- self.day.get_toplevel ())
+ ui.error_dialog_parented (str (error),
+ self.day.get_toplevel ())
return -1
return 1
@@ -903,7 +903,7 @@
modified = True
else:
if not key_re.match (key):
- ui.gnome_error_dialog_parented (
+ ui.error_dialog_parented (
_("Invalid key format"), self.w.get_toplevel ())
return None
@@ -911,7 +911,7 @@
if key != self.entry.key:
if database.has_key (key):
- ui.gnome_error_dialog_parented (
+ ui.error_dialog_parented (
_("Key `%s' already exists") % str (key.key),
self.w.get_toplevel ())
return None
@@ -928,7 +928,7 @@
except UnicodeError:
f = Types.get_field (item.field)
- ui.gnome_error_dialog_parented (
+ ui.error_dialog_parented (
_("The `%s' field contains a non Latin-1 symbol") %
f.name, self.w.get_toplevel ())
return None
@@ -998,7 +998,7 @@
text = text.encode ('latin-1')
except UnicodeError:
- ui.gnome_error_dialog_parented (
+ ui.error_dialog_parented (
_("Your text contains non Latin-1 symbols"),
self.w.get_toplevel ())
return None
pybliographer.patch:
Index: pybliographer.patch
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/FC-4/pybliographer.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pybliographer.patch 15 Oct 2005 21:56:03 -0000 1.1
+++ pybliographer.patch 20 Dec 2005 14:11:13 -0000 1.2
@@ -1,13 +1,112 @@
+--- pybliographer-1.2.7-orig/Pyblio/Format/BibTeX.py 2005-10-13 18:11:13.000000000 +0200
++++ pybliographer-1.2.7/Pyblio/Format/BibTeX.py 2005-12-09 13:33:04.000000000 +0100
+@@ -425,7 +425,7 @@
+ else:
+ if self.dict.has_key (entry.key):
+ errors.append (_("%s:%d: key `%s' already defined") % (
+- str (self.key), entry.line, entry.key.key))
++ repr (self.key), entry.line, repr (entry.key.key)))
+ else:
+ self.dict [entry.key] = entry
+
+--- pybliographer-1.2.7-orig/Pyblio/Format/Medline.py 2005-10-13 18:11:13.000000000 +0200
++++ pybliographer-1.2.7/Pyblio/Format/Medline.py 2005-12-09 13:33:04.000000000 +0100
+@@ -111,7 +111,7 @@
+ first, last, lineage = [], [], []
+
+ for part in string.split (au, ' '):
+- if part == string.upper (part):
++ if part.isupper ():
+ # in upper-case, this is a first name
+ if len (last) > 0:
+ first.append (part)
+@@ -130,7 +130,7 @@
+ first = first [0:1]
+
+ if len (first) > 0:
+- first = string.join (first [0], '.') + '.'
++ first = string.join (first [0], '. ') + '.'
+ else:
+ first = None
+
+@@ -158,8 +158,6 @@
+ for f in table.keys ():
+ f_mapped = one_to_one.get(f, 'medline-%s' %(f.lower()))
+ text_type = Types.get_field(f_mapped).type
+- print 'MEDLINE: field name %s has type %s' %(
+- f_mapped, text_type)
+ norm [f_mapped] = text_type (string.join (table [f], " ; "))
+
+ return Base.Entry (None, type, norm)
+@@ -302,3 +300,8 @@
+ Autoload.register ('format', 'Medline', {'open' : opener,
+ 'write' : writer,
+ 'iter' : iterator})
++
++### Local Variables:
++### Mode: python
++### py-master-file : "ut_medline.py"
++### End:
+--- pybliographer-1.2.7-orig/Pyblio/GnomeUI/Document.py 2005-10-13 18:11:17.000000000 +0200
++++ pybliographer-1.2.7/Pyblio/GnomeUI/Document.py 2005-12-09 13:33:04.000000000 +0100
+@@ -1052,7 +1052,6 @@
+ try:
+ self.lyx = LyX.LyXClient ()
+ except IOError, msg:
+- msg = msg [1].decode (enc)
+ self.w.error (_("Can't connect to LyX:\n%s") % msg)
+ return
+
+--- pybliographer-1.2.7-orig/Pyblio/GnomeUI/FileSelector.py 2005-10-13 18:11:13.000000000 +0200
++++ pybliographer-1.2.7/Pyblio/GnomeUI/FileSelector.py 2005-12-19 11:58:43.000000000 +0100
+@@ -87,11 +87,13 @@
+ liste = Autoload.available ('format')
+ liste.sort ()
+
+- self.formats = [ None ]
++ self.formats = []
+
+ if has_auto:
+ self.menu.append_text (_(' - According to file suffix - '))
+ self.ftype = None
++ self.formats.append(None)
++
+ else:
+ self.ftype = liste [0]
+
+--- pybliographer-1.2.7-orig/Pyblio/LyX.py 2005-10-13 18:11:13.000000000 +0200
++++ pybliographer-1.2.7/Pyblio/LyX.py 2005-12-09 13:33:05.000000000 +0100
+@@ -33,14 +33,14 @@
+ pin = os.path.expanduser (base + '.in')
+ try:
+ ans = os.stat (pin)
+- except os.error:
+- raise IOError, (-1, _("no input pipe `%s'") % pin)
++ except OSError, msg:
++ raise IOError (_("no input pipe `%s'") % pin)
+
+ pout = os.path.expanduser (base + '.out')
+ try:
+ ans = os.stat (pout)
+ except os.error:
+- raise IOError, (-1, _("no output pipe `%s'") % pout)
++ raise IOError (_("no output pipe `%s'") % pout)
+
+ def noaction (* arg): return
+
--- pybliographer-1.2.7-orig/setup-check.py 2005-10-13 18:11:19.000000000 +0200
-+++ pybliographer-1.2.7/setup-check.py 2005-10-15 23:27:16.000000000 +0200
-@@ -86,8 +86,8 @@
++++ pybliographer-1.2.7/setup-check.py 2005-10-18 12:04:58.000000000 +0200
+@@ -86,9 +86,10 @@
error ('unexpected error')
-if gtk.pygtk_version < (2,4,0):
- error ('requested version for PyGtk is %s, but I detected %s' % ('2.4.0', v))
-+#if gtk.pygtk_version < (2,4,0):
-+# error ('requested version for PyGtk is %s, but I detected %s' % ('2.4.0', v))
-
+-
++else:
++ if gtk.pygtk_version < (2,4,0):
++ error ('requested version for PyGtk is %s, but I detected %s' % ('2.4.0', v))
++
try:
+ import _recode
Index: pybliographer.spec
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/FC-4/pybliographer.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pybliographer.spec 15 Oct 2005 21:56:03 -0000 1.9
+++ pybliographer.spec 20 Dec 2005 14:11:13 -0000 1.10
@@ -1,11 +1,12 @@
Summary: Framework for working with bibliographic databases
Name: pybliographer
Version: 1.2.7
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL
Group: Applications/Publishing
Source: http://dl.sf.net/pybliographer/pybliographer-1.2.7.tar.gz
Patch0: pybliographer.patch
+Patch1: gnome-python.patch
Url: http://www.pybliographer.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -44,6 +45,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
%configure
@@ -154,6 +156,9 @@
%changelog
+* Tue Dec 20 2005 Zoltan Kota <z.kota at gmx.net> - 1.2.7-2
+- add patches for fixing different bugs
+
* Fri Oct 15 2005 Zoltan Kota <z.kota at gmx.net> - 1.2.7-1
- update to 1.2.7
- drop gnome-help.patch, fixed upstream
- Previous message (by thread): rpms/pybliographer/FC-3 pybliographer.patch, 1.1, 1.2 pybliographer.spec, 1.6, 1.7
- Next message (by thread): rpms/pybliographer/devel gnome-python.patch, NONE, 1.1 pybliographer.patch, 1.1, 1.2 pybliographer.spec, 1.10, 1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list