forked from pool/python-vobject
- verion 0.9.9
* Added product version to PRODID tag in iCalendar headers * Added support for GEO tags in vCards * radicale-1587.vcf added (missing in release tarball) OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-vobject?expand=0&rev=20
This commit is contained in:
61
no-six.patch
61
no-six.patch
@@ -1,8 +1,7 @@
|
|||||||
Index: vobject-0.9.8/vobject/base.py
|
diff -rU 3 a/vobject/base.py b/vobject/base.py
|
||||||
===================================================================
|
--- a/vobject/base.py 2024-12-16 08:15:20.000000000 +0100
|
||||||
--- vobject-0.9.8.orig/vobject/base.py
|
+++ b/vobject/base.py 2025-05-08 10:54:19.517509757 +0200
|
||||||
+++ vobject-0.9.8/vobject/base.py
|
@@ -6,7 +6,7 @@
|
||||||
@@ -6,7 +6,7 @@ import copy
|
|
||||||
import codecs
|
import codecs
|
||||||
import logging
|
import logging
|
||||||
import re
|
import re
|
||||||
@@ -10,8 +9,8 @@ Index: vobject-0.9.8/vobject/base.py
|
|||||||
+import io
|
+import io
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
# ------------------------------------ Python 2/3 compatibility challenges ----
|
# Package version
|
||||||
@@ -913,7 +913,7 @@ def getLogicalLines(fp, allowQP=True):
|
@@ -858,7 +858,7 @@
|
||||||
Quoted-printable data will be decoded in the Behavior decoding phase.
|
Quoted-printable data will be decoded in the Behavior decoding phase.
|
||||||
|
|
||||||
# We're leaving this test in for awhile, because the unittest was ugly and dumb.
|
# We're leaving this test in for awhile, because the unittest was ugly and dumb.
|
||||||
@@ -20,7 +19,7 @@ Index: vobject-0.9.8/vobject/base.py
|
|||||||
>>> f=StringIO(testLines)
|
>>> f=StringIO(testLines)
|
||||||
>>> for n, l in enumerate(getLogicalLines(f)):
|
>>> for n, l in enumerate(getLogicalLines(f)):
|
||||||
... print("Line %s: %s" % (n, l[0]))
|
... print("Line %s: %s" % (n, l[0]))
|
||||||
@@ -936,7 +936,7 @@ def getLogicalLines(fp, allowQP=True):
|
@@ -881,7 +881,7 @@
|
||||||
|
|
||||||
else:
|
else:
|
||||||
quotedPrintable = False
|
quotedPrintable = False
|
||||||
@@ -29,7 +28,7 @@ Index: vobject-0.9.8/vobject/base.py
|
|||||||
logicalLine = newbuffer()
|
logicalLine = newbuffer()
|
||||||
lineNumber = 0
|
lineNumber = 0
|
||||||
lineStartNumber = 0
|
lineStartNumber = 0
|
||||||
@@ -1050,7 +1050,7 @@ def defaultSerialize(obj, buf, lineLengt
|
@@ -996,7 +996,7 @@
|
||||||
"""
|
"""
|
||||||
Encode and fold obj and its children, write to buf or return a string.
|
Encode and fold obj and its children, write to buf or return a string.
|
||||||
"""
|
"""
|
||||||
@@ -38,7 +37,7 @@ Index: vobject-0.9.8/vobject/base.py
|
|||||||
|
|
||||||
if isinstance(obj, Component):
|
if isinstance(obj, Component):
|
||||||
if obj.group is None:
|
if obj.group is None:
|
||||||
@@ -1072,7 +1072,7 @@ def defaultSerialize(obj, buf, lineLengt
|
@@ -1018,7 +1018,7 @@
|
||||||
if obj.behavior and not startedEncoded:
|
if obj.behavior and not startedEncoded:
|
||||||
obj.behavior.encode(obj)
|
obj.behavior.encode(obj)
|
||||||
|
|
||||||
@@ -46,8 +45,8 @@ Index: vobject-0.9.8/vobject/base.py
|
|||||||
+ s = io.StringIO()
|
+ s = io.StringIO()
|
||||||
|
|
||||||
if obj.group is not None:
|
if obj.group is not None:
|
||||||
s.write(obj.group + ".")
|
s.write(obj.group + '.')
|
||||||
@@ -1141,7 +1141,7 @@ def readComponents(
|
@@ -1082,7 +1082,7 @@
|
||||||
Generate one Component at a time from a stream.
|
Generate one Component at a time from a stream.
|
||||||
"""
|
"""
|
||||||
if isinstance(streamOrString, basestring):
|
if isinstance(streamOrString, basestring):
|
||||||
@@ -56,11 +55,10 @@ Index: vobject-0.9.8/vobject/base.py
|
|||||||
else:
|
else:
|
||||||
stream = streamOrString
|
stream = streamOrString
|
||||||
|
|
||||||
Index: vobject-0.9.8/vobject/hcalendar.py
|
diff -rU 3 a/vobject/hcalendar.py b/vobject/hcalendar.py
|
||||||
===================================================================
|
--- a/vobject/hcalendar.py 2024-10-01 16:46:45.000000000 +0200
|
||||||
--- vobject-0.9.8.orig/vobject/hcalendar.py
|
+++ b/vobject/hcalendar.py 2025-05-08 10:55:12.047890349 +0200
|
||||||
+++ vobject-0.9.8/vobject/hcalendar.py
|
@@ -28,7 +28,7 @@
|
||||||
@@ -28,7 +28,7 @@ and an equivalent event in hCalendar for
|
|
||||||
</span>
|
</span>
|
||||||
"""
|
"""
|
||||||
|
|
||||||
@@ -69,7 +67,7 @@ Index: vobject-0.9.8/vobject/hcalendar.py
|
|||||||
|
|
||||||
from datetime import date, datetime, timedelta
|
from datetime import date, datetime, timedelta
|
||||||
|
|
||||||
@@ -45,7 +45,7 @@ class HCalendar(VCalendar2_0):
|
@@ -45,7 +45,7 @@
|
||||||
Serialize iCalendar to HTML using the hCalendar microformat (http://microformats.org/wiki/hcalendar)
|
Serialize iCalendar to HTML using the hCalendar microformat (http://microformats.org/wiki/hcalendar)
|
||||||
"""
|
"""
|
||||||
|
|
||||||
@@ -78,11 +76,10 @@ Index: vobject-0.9.8/vobject/hcalendar.py
|
|||||||
level = 0 # holds current indentation level
|
level = 0 # holds current indentation level
|
||||||
tabwidth = 3
|
tabwidth = 3
|
||||||
|
|
||||||
Index: vobject-0.9.8/vobject/icalendar.py
|
diff -rU 3 a/vobject/icalendar.py b/vobject/icalendar.py
|
||||||
===================================================================
|
--- a/vobject/icalendar.py 2024-12-16 08:09:54.000000000 +0100
|
||||||
--- vobject-0.9.8.orig/vobject/icalendar.py
|
+++ b/vobject/icalendar.py 2025-05-08 10:57:12.542858557 +0200
|
||||||
+++ vobject-0.9.8/vobject/icalendar.py
|
@@ -10,7 +10,7 @@
|
||||||
@@ -10,7 +10,7 @@ import string
|
|
||||||
import base64
|
import base64
|
||||||
|
|
||||||
from dateutil import rrule, tz
|
from dateutil import rrule, tz
|
||||||
@@ -91,39 +88,39 @@ Index: vobject-0.9.8/vobject/icalendar.py
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
import pytz
|
import pytz
|
||||||
@@ -65,7 +65,7 @@ def toUnicode(s):
|
@@ -56,7 +56,7 @@
|
||||||
"""
|
"""
|
||||||
Take a string or unicode, turn it into unicode, decoding as utf-8
|
Take a string or unicode, turn it into unicode, decoding as utf-8
|
||||||
"""
|
"""
|
||||||
- if isinstance(s, six.binary_type):
|
- if isinstance(s, six.binary_type):
|
||||||
+ if isinstance(s, bytes):
|
+ if isinstance(s, bytes):
|
||||||
s = s.decode("utf-8")
|
s = s.decode('utf-8')
|
||||||
return s
|
return s
|
||||||
|
|
||||||
@@ -154,7 +154,7 @@ class TimezoneComponent(Component):
|
@@ -135,7 +135,7 @@
|
||||||
"tzid",
|
good_lines = ('rdate', 'rrule', 'dtstart', 'tzname', 'tzoffsetfrom',
|
||||||
)
|
'tzoffsetto', 'tzid')
|
||||||
# serialize encodes as utf-8, cStringIO will leave utf-8 alone
|
# serialize encodes as utf-8, cStringIO will leave utf-8 alone
|
||||||
- buffer = six.StringIO()
|
- buffer = six.StringIO()
|
||||||
+ buffer = io.StringIO()
|
+ buffer = io.StringIO()
|
||||||
# allow empty VTIMEZONEs
|
# allow empty VTIMEZONEs
|
||||||
if len(self.contents) == 0:
|
if len(self.contents) == 0:
|
||||||
return None
|
return None
|
||||||
@@ -607,7 +607,7 @@ class RecurringComponent(Component):
|
@@ -569,7 +569,7 @@
|
||||||
self.add(name).value = setlist
|
self.add(name).value = setlist
|
||||||
elif name in RULENAMES:
|
elif name in RULENAMES:
|
||||||
for rule in setlist:
|
for rule in setlist:
|
||||||
- buf = six.StringIO()
|
- buf = six.StringIO()
|
||||||
+ buf = io.StringIO()
|
+ buf = io.StringIO()
|
||||||
buf.write("FREQ=")
|
buf.write('FREQ=')
|
||||||
buf.write(FREQUENCIES[rule._freq])
|
buf.write(FREQUENCIES[rule._freq])
|
||||||
|
|
||||||
@@ -1074,7 +1074,7 @@ class VCalendar2_0(VCalendarComponentBeh
|
@@ -1010,7 +1010,7 @@
|
||||||
transformed = obj
|
transformed = obj
|
||||||
undoTransform = False
|
undoTransform = False
|
||||||
out = None
|
out = None
|
||||||
- outbuf = buf or six.StringIO()
|
- outbuf = buf or six.StringIO()
|
||||||
+ outbuf = buf or io.StringIO()
|
+ outbuf = buf or io.StringIO()
|
||||||
if obj.group is None:
|
if obj.group is None:
|
||||||
groupString = ""
|
groupString = ''
|
||||||
else:
|
else:
|
||||||
|
|||||||
@@ -1,3 +1,11 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu May 8 09:04:57 UTC 2025 - Axel Braun <axel.braun@gmx.de>
|
||||||
|
|
||||||
|
- verion 0.9.9
|
||||||
|
* Added product version to PRODID tag in iCalendar headers
|
||||||
|
* Added support for GEO tags in vCards
|
||||||
|
* radicale-1587.vcf added (missing in release tarball)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Dec 19 09:35:46 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
|
Thu Dec 19 09:35:46 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package python-vobject
|
# spec file for package python-vobject
|
||||||
#
|
#
|
||||||
# Copyright (c) 2024 SUSE LLC
|
# Copyright (c) 2025 SUSE LLC
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@@ -19,7 +19,7 @@
|
|||||||
%global modname vobject
|
%global modname vobject
|
||||||
%{?sle15_python_module_pythons}
|
%{?sle15_python_module_pythons}
|
||||||
Name: python-vobject
|
Name: python-vobject
|
||||||
Version: 0.9.8
|
Version: 0.9.9
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Python package for parsing and creating iCalendar and vCard files
|
Summary: Python package for parsing and creating iCalendar and vCard files
|
||||||
License: Apache-2.0
|
License: Apache-2.0
|
||||||
@@ -27,6 +27,8 @@ Group: Development/Languages/Python
|
|||||||
URL: https://github.com/py-vobject/vobject/
|
URL: https://github.com/py-vobject/vobject/
|
||||||
Source: https://files.pythonhosted.org/packages/source/v/vobject/%{modname}-%{version}.tar.gz
|
Source: https://files.pythonhosted.org/packages/source/v/vobject/%{modname}-%{version}.tar.gz
|
||||||
# PATCH-FIX-UPSTREAM https://github.com/py-vobject/vobject/pull/87 remove six
|
# PATCH-FIX-UPSTREAM https://github.com/py-vobject/vobject/pull/87 remove six
|
||||||
|
# file missiing in release
|
||||||
|
Source1: radicale-1587.vcf
|
||||||
Patch0: no-six.patch
|
Patch0: no-six.patch
|
||||||
BuildRequires: %{python_module PyICU}
|
BuildRequires: %{python_module PyICU}
|
||||||
BuildRequires: %{python_module devel >= 2.7}
|
BuildRequires: %{python_module devel >= 2.7}
|
||||||
@@ -56,6 +58,8 @@ unicode strings.
|
|||||||
# Fix wrong-file-end-of-line-encoding
|
# Fix wrong-file-end-of-line-encoding
|
||||||
sed -i 's/\r$//' ACKNOWLEDGEMENTS.txt
|
sed -i 's/\r$//' ACKNOWLEDGEMENTS.txt
|
||||||
|
|
||||||
|
cp %{S:1} test_files/.
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%python_build
|
%python_build
|
||||||
|
|
||||||
|
|||||||
6
radicale-1587.vcf
Normal file
6
radicale-1587.vcf
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
BEGIN:VCARD
|
||||||
|
VERSION:3.0
|
||||||
|
FN:Given Family
|
||||||
|
N:Family;Given;Additional;Prefix;Suffix
|
||||||
|
GEO:37.386013;-122.082932
|
||||||
|
END:VCARD
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:db00a7f4db49397155dd8a6871e8a2a0175a6eba5a654c30e910f82b29514b58
|
|
||||||
size 61760
|
|
||||||
3
vobject-0.9.9.tar.gz
Normal file
3
vobject-0.9.9.tar.gz
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:ac44e5d7e2079d84c1d52c50a615b9bec4b1ba958608c4c7fe40cbf33247b38e
|
||||||
|
size 1208905
|
||||||
Reference in New Issue
Block a user