Accepting request 212223 from GNOME:Next
Update to 2.0.2 OBS-URL: https://build.opensuse.org/request/show/212223 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/itstool?expand=0&rev=20
This commit is contained in:
parent
e1412a597c
commit
037d7368ff
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:ec6b1b32403cbe338b6ac63c61ab1ecd361f539a6e41ef50eae56a4f577234d1
|
|
||||||
size 93084
|
|
3
itstool-2.0.2.tar.bz2
Normal file
3
itstool-2.0.2.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:bf909fb59b11a646681a8534d5700fec99be83bb2c57badf8c1844512227033a
|
||||||
|
size 96748
|
@ -1,37 +0,0 @@
|
|||||||
From 46067ed60cbe1e5e3efe176da1f40f8219336490 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Shaun McCance <shaunm@gnome.org>
|
|
||||||
Date: Sun, 24 Nov 2013 14:10:03 -0500
|
|
||||||
Subject: [PATCH] Fixed crash in locale filter and drop rule, #715116
|
|
||||||
|
|
||||||
When the dropped node has no preceding sibling, itstool crashes
|
|
||||||
because it tries to unlink prev node if it's blank.
|
|
||||||
---
|
|
||||||
itstool.in | 4 ++--
|
|
||||||
1 files changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/itstool.in b/itstool.in
|
|
||||||
index 150b395..a04ab2b 100755
|
|
||||||
--- a/itstool.in
|
|
||||||
+++ b/itstool.in
|
|
||||||
@@ -859,7 +859,7 @@ class Document (object):
|
|
||||||
prev = node.prev
|
|
||||||
node.unlinkNode()
|
|
||||||
node.freeNode()
|
|
||||||
- if prev.isBlankNode():
|
|
||||||
+ if prev is not None and prev.isBlankNode():
|
|
||||||
prev.unlinkNode()
|
|
||||||
prev.freeNode()
|
|
||||||
return
|
|
||||||
@@ -914,7 +914,7 @@ class Document (object):
|
|
||||||
prev = node.prev
|
|
||||||
node.unlinkNode()
|
|
||||||
node.freeNode()
|
|
||||||
- if prev.isBlankNode():
|
|
||||||
+ if prev is not None and prev.isBlankNode():
|
|
||||||
prev.unlinkNode()
|
|
||||||
prev.freeNode()
|
|
||||||
return
|
|
||||||
--
|
|
||||||
1.7.1
|
|
||||||
|
|
||||||
|
|
@ -1,8 +1,19 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Dec 24 19:28:51 UTC 2013 - dimstar@opensuse.org
|
||||||
|
|
||||||
|
- Update to version 2.0.2:
|
||||||
|
+ Fixed crash in locale filter and drop rule (bgo#715116).
|
||||||
|
+ Don't hardcode python path (fdo#72533).
|
||||||
|
+ Updated man page.
|
||||||
|
- Drop itstool-fix-crash.patch: fixed upstream.
|
||||||
|
- No longer replace the shebang in itstool and itstool.in: the
|
||||||
|
upstream provided solution sets it based on configure's findings.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Nov 25 08:50:55 UTC 2013 - dimstar@opensuse.org
|
Mon Nov 25 08:50:55 UTC 2013 - dimstar@opensuse.org
|
||||||
|
|
||||||
- Add itstool-fix-crash.patch: Fixed crash in locale filter and
|
- Add itstool-fix-crash.patch: Fixed crash in locale filter and
|
||||||
drop rule (bgo#71511).
|
drop rule (bgo#715116).
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun Nov 24 12:53:53 UTC 2013 - dimstar@opensuse.org
|
Sun Nov 24 12:53:53 UTC 2013 - dimstar@opensuse.org
|
||||||
|
@ -17,15 +17,13 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: itstool
|
Name: itstool
|
||||||
Version: 2.0.1
|
Version: 2.0.2
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Tool to translate XML documents using PO files
|
Summary: Tool to translate XML documents using PO files
|
||||||
License: GPL-3.0+
|
License: GPL-3.0+
|
||||||
Group: Development/Tools/Other
|
Group: Development/Tools/Other
|
||||||
Url: http://itstool.org
|
Url: http://itstool.org
|
||||||
Source: http://files.itstool.org/itstool/%{name}-%{version}.tar.bz2
|
Source: http://files.itstool.org/itstool/%{name}-%{version}.tar.bz2
|
||||||
# PATCH-FIX-UPSTREAM itstool-fix-crash.patch bgo#715116 dimstar@opensuse.org -- Fixed crash in locale filter and drop rule
|
|
||||||
Patch0: itstool-fix-crash.patch
|
|
||||||
BuildRequires: libxml2-python
|
BuildRequires: libxml2-python
|
||||||
Requires: libxml2-python
|
Requires: libxml2-python
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
@ -39,8 +37,6 @@ Internationalization Tag Set (ITS).
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1
|
|
||||||
sed -i "s:#!/usr/bin/env python:#!/usr/bin/python:" itstool itstool.in
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure
|
%configure
|
||||||
|
Loading…
Reference in New Issue
Block a user