diff --git a/.gitignore b/.gitignore index 90bb982..12950d6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /python-xmp-toolkit-2.0.1.tar.gz +/python-xmp-toolkit-2.0.2.tar.gz diff --git a/0cbdae107d9b8e825511c6a6833d47923208ed7d.patch b/0cbdae107d9b8e825511c6a6833d47923208ed7d.patch new file mode 100644 index 0000000..6bbe093 --- /dev/null +++ b/0cbdae107d9b8e825511c6a6833d47923208ed7d.patch @@ -0,0 +1,54 @@ +From 0cbdae107d9b8e825511c6a6833d47923208ed7d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Carretero?= +Date: Mon, 8 Jan 2024 10:40:00 -0500 +Subject: [PATCH] enable pypi upload of v2.0.2 + +--- + README.rst | 4 ++-- + libxmp/version.py | 2 +- + setup.py | 1 + + 3 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/README.rst b/README.rst +index 95f7c1f..5e73947 100644 +--- a/README.rst ++++ b/README.rst +@@ -24,7 +24,7 @@ Python XMP Toolkit has been developed by: + * CRS4 - Centre for Advanced Studies, Research and Development in Sardinia + + Documentation +-============ ++============= + Documentation is available at or can be build using Sphinx: :: + + pip install Sphinx +@@ -42,4 +42,4 @@ or (to also show test coverage) :: + + .. image:: https://d2weczhvl823v0.cloudfront.net/python-xmp-toolkit/python-xmp-toolkit/trend.png + :alt: Bitdeli badge +- :target: https://bitdeli.com/free +\ No newline at end of file ++ :target: https://bitdeli.com/free +diff --git a/libxmp/version.py b/libxmp/version.py +index bf1034f..d2aa557 100644 +--- a/libxmp/version.py ++++ b/libxmp/version.py +@@ -40,5 +40,5 @@ + + # Do not change the format of this next line! Doing so risks breaking + # setup.py +-VERSION = "2.0.1" ++VERSION = "2.0.2" + VERSION_TUPLE = LooseVersion(VERSION).version +diff --git a/setup.py b/setup.py +index 684066f..98b6783 100644 +--- a/setup.py ++++ b/setup.py +@@ -58,6 +58,7 @@ + 'author_email': 'lars@hankat.dk', + 'url': 'https://github.com/python-xmp-toolkit/python-xmp-toolkit', + 'long_description': open('README.rst').read(), ++ 'long_description_content_type': 'text/x-rst', + 'download_url': 'https://pypi.python.org/pypi/python-xmp-toolkit', + 'license': 'New BSD License', + 'install_requires': ['pytz'], diff --git a/2f94011ab789d1d2cabc41db7a708a19a62bb573.patch b/2f94011ab789d1d2cabc41db7a708a19a62bb573.patch deleted file mode 100644 index 7bee8e7..0000000 --- a/2f94011ab789d1d2cabc41db7a708a19a62bb573.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 2f94011ab789d1d2cabc41db7a708a19a62bb573 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Hubert=20Figui=C3=A8re?= -Date: Sun, 22 Jan 2017 00:56:01 -0500 -Subject: [PATCH] Fix test following a bugfix from Exempi 2.4.0 - -Fixes issue #67 ---- - test/test_exempi.py | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/test/test_exempi.py b/test/test_exempi.py -index aafd59d..bfa9a7c 100644 ---- a/test/test_exempi.py -+++ b/test/test_exempi.py -@@ -30,6 +30,7 @@ - from libxmp.consts import XMP_NS_Photoshop as NS_PHOTOSHOP - from libxmp.consts import XMP_NS_TIFF as NS_TIFF - from libxmp.consts import XMP_NS_XMP as NS_XAP -+from libxmp.consts import XMP_NS_XML as NS_XML - from libxmp.consts import XMP_NS_CameraRaw as NS_CAMERA_RAW_SETTINGS - from libxmp.consts import XMP_ITERATOR_OPTIONS, XMP_SERIAL_OPTIONS - from libxmp.consts import XMP_SKIP_OPTIONS -@@ -543,7 +544,10 @@ def test_single_namespace_single_path_leaf_names(self): - options = XMP_ITERATOR_OPTIONS['iter_justleafname'] - schemas, paths, props = self.collect_iteration(NS_DC, "rights", options) - -- self.assertEqual(schemas, [NS_DC, NS_DC, NS_DC]) -+ # in Exempi 2.4.0 and later, the actual namespace is returned. -+ # This was fixed in the Adobe SDK CS6 (version 5.4.0) -+ # So we test for both values since we can't check the version at runtime. -+ self.assertTrue(schemas == [NS_DC, NS_DC, NS_DC] or schemas == [NS_DC, '', NS_XML]) - self.assertEqual(paths, - ['dc:rights', - '[1]', diff --git a/python-xmp-toolkit.spec b/python-xmp-toolkit.spec index fd217a4..a681fa9 100644 --- a/python-xmp-toolkit.spec +++ b/python-xmp-toolkit.spec @@ -2,17 +2,17 @@ %global srcname xmp-toolkit Name: python-%{srcname} -Version: 2.0.1 +Version: 2.0.2 Release: %autorelease Summary: Python XMP Toolkit for working with metadata License: BSD-3-Clause URL: https://github.com/python-xmp-toolkit/python-xmp-toolkit -Source0: %{pypi_source %{pypi_name}} -# https://github.com/python-xmp-toolkit/python-xmp-toolkit/pull/68 -Patch0001: 2f94011ab789d1d2cabc41db7a708a19a62bb573.patch +# Can't use pypi_source due to https://github.com/python-xmp-toolkit/python-xmp-toolkit/issues/91 +Source0: https://github.com/python-xmp-toolkit/python-xmp-toolkit/archive/v%{version}/%{pypi_name}-%{version}.tar.gz # https://github.com/python-xmp-toolkit/python-xmp-toolkit/pull/84 Source1: https://github.com/python-xmp-toolkit/python-xmp-toolkit/raw/e0f42af4a731ac1eea2977895f2c8dd0264304c3/test/samples/BlueSquare.gif +Patch: https://github.com/python-xmp-toolkit/python-xmp-toolkit/commit/0cbdae107d9b8e825511c6a6833d47923208ed7d.patch BuildArch: noarch diff --git a/sources b/sources index f100e65..d37e550 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (python-xmp-toolkit-2.0.1.tar.gz) = 79dd3b4ba57e48af8980e25cf55215ed7bc654843354a54c0e8688bdcec1ac16e602a7e7d9d7bd83e9e424f189372c576ccef395e0bb220d3545c1135eff320a +SHA512 (python-xmp-toolkit-2.0.2.tar.gz) = 7ab70e78abe3f315863c444c5d841ff4ae9e95968ccef45e15d20df5206140939f0e857e6c987a643ba908aa8d92dc4870e77d94cfafc547208e4705fa9187e1