From a69c54cec1e9d13fb49706b4847934f8f8f7710a Mon Sep 17 00:00:00 2001
From: wedjat <wedjat@protonmail.com>
Date: Sat, 10 Mar 2018 19:19:54 +0100
Subject: [PATCH 01/19] Initial commit

---
 .SRCINFO    | 18 ++++++++++++++++
 .gitignore  |  4 ++++
 PKGBUILD    | 36 +++++++++++++++++++++++++++++++
 license.txt | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 119 insertions(+)
 create mode 100644 .SRCINFO
 create mode 100644 .gitignore
 create mode 100644 PKGBUILD
 create mode 100644 license.txt

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 0000000..d18ed6b
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,18 @@
+pkgbase = python-pydicom
+	pkgdesc = Pure python package for working with DICOM files
+	pkgver = 1.0.1
+	pkgrel = 1
+	url = https://pydicom.github.io/pydicom/stable/index.html
+	arch = x86_64
+	license = MIT
+	license = custom
+	makedepends = python-setuptools
+	depends = python
+	depends = python-numpy
+	source = python-pydicom-1.0.1.tar.gz::https://github.com/pydicom/pydicom/archive/v1.0.1.tar.gz
+	source = file://license.txt
+	md5sums = 306ff7a9257a6d9e44ecf9b8c888c350
+	md5sums = dee3b5d8029934bd8195cd244b966055
+
+pkgname = python-pydicom
+
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6a43a19
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*tar.gz
+*pkg.tar.xz
+pkg
+src
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 0000000..bf47f39
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,36 @@
+# Maintainer: wedjat <wedjat@protonmail.com>
+# Contributor: Andrzej Giniewicz <gginiu@gmail.com>
+pkgname=python-pydicom
+pkgver=1.0.1
+pkgrel=1
+pkgdesc="Pure python package for working with DICOM files"
+arch=("x86_64")
+url="https://pydicom.github.io/pydicom/stable/index.html"
+license=('MIT' 'custom')
+depends=('python' 'python-numpy')
+makedepends=('python-setuptools')
+optdepends=()
+options=()
+source=("$pkgname-$pkgver.tar.gz::https://github.com/pydicom/pydicom/archive/v$pkgver.tar.gz" "file://license.txt")
+md5sums=('306ff7a9257a6d9e44ecf9b8c888c350'
+         'dee3b5d8029934bd8195cd244b966055')
+
+prepare() 
+{
+	cd "$srcdir/pydicom-$pkgver"
+	sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python|"  $(find -name '*.py')
+}
+
+build() 
+{
+	cd "$srcdir/pydicom-$pkgver"
+	python setup.py build
+}
+
+package() 
+{
+	cd "$srcdir/pydicom-$pkgver"
+	python setup.py install --root="$pkgdir"/ --optimize=1
+
+        install -D "$srcdir/pydicom-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
diff --git a/license.txt b/license.txt
new file mode 100644
index 0000000..dfa0394
--- /dev/null
+++ b/license.txt
@@ -0,0 +1,61 @@
+License file for pydicom, a pure-python DICOM library
+
+Copyright (c) 2008-2017 Darcy Mason and pydicom contributors
+
+Except for portions outlined below, pydicom is released under an MIT license:
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+Portions of pydicom (private dictionary file(s)) were generated from the 
+private dictionary of the GDCM library, released under the following license:
+
+  Program: GDCM (Grassroots DICOM). A DICOM library
+  Module:  http://gdcm.sourceforge.net/Copyright.html
+
+Copyright (c) 2006-2010 Mathieu Malaterre
+Copyright (c) 1993-2005 CREATIS
+(CREATIS = Centre de Recherche et d'Applications en Traitement de l'Image)
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+ * Neither name of Mathieu Malaterre, or CREATIS, nor the names of any
+   contributors (CNRS, INSERM, UCB, Universite Lyon I), may be used to
+   endorse or promote products derived from this software without specific
+   prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+

From 0d86de2a64836495150c37de76c5652cc933de45 Mon Sep 17 00:00:00 2001
From: wedjat <wedjat@protonmail.com>
Date: Mon, 21 May 2018 18:22:14 +0200
Subject: [PATCH 02/19] Update to 1.0.2

---
 PKGBUILD | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index bf47f39..0c06d77 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: wedjat <wedjat@protonmail.com>
 # Contributor: Andrzej Giniewicz <gginiu@gmail.com>
 pkgname=python-pydicom
-pkgver=1.0.1
+pkgver=1.0.2
 pkgrel=1
 pkgdesc="Pure python package for working with DICOM files"
 arch=("x86_64")
@@ -12,7 +12,7 @@ makedepends=('python-setuptools')
 optdepends=()
 options=()
 source=("$pkgname-$pkgver.tar.gz::https://github.com/pydicom/pydicom/archive/v$pkgver.tar.gz" "file://license.txt")
-md5sums=('306ff7a9257a6d9e44ecf9b8c888c350'
+md5sums=('f6381a6a82b8bd8ac6558db2042c8ebb'
          'dee3b5d8029934bd8195cd244b966055')
 
 prepare() 
@@ -30,7 +30,7 @@ build()
 package() 
 {
 	cd "$srcdir/pydicom-$pkgver"
-	python setup.py install --root="$pkgdir"/ --optimize=1
+	python setup.py install --skip-build --root="$pkgdir"/ --optimize=1
 
         install -D "$srcdir/pydicom-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }

From 7a3211540edfc05434afafbf4375570b0582bb22 Mon Sep 17 00:00:00 2001
From: wedjat <wedjat@protonmail.com>
Date: Mon, 21 May 2018 18:25:57 +0200
Subject: [PATCH 03/19] .SRCINFO updated

---
 .SRCINFO | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index d18ed6b..cf36012 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = python-pydicom
 	pkgdesc = Pure python package for working with DICOM files
-	pkgver = 1.0.1
+	pkgver = 1.0.2
 	pkgrel = 1
 	url = https://pydicom.github.io/pydicom/stable/index.html
 	arch = x86_64
@@ -9,9 +9,9 @@ pkgbase = python-pydicom
 	makedepends = python-setuptools
 	depends = python
 	depends = python-numpy
-	source = python-pydicom-1.0.1.tar.gz::https://github.com/pydicom/pydicom/archive/v1.0.1.tar.gz
+	source = python-pydicom-1.0.2.tar.gz::https://github.com/pydicom/pydicom/archive/v1.0.2.tar.gz
 	source = file://license.txt
-	md5sums = 306ff7a9257a6d9e44ecf9b8c888c350
+	md5sums = f6381a6a82b8bd8ac6558db2042c8ebb
 	md5sums = dee3b5d8029934bd8195cd244b966055
 
 pkgname = python-pydicom

From 3d439ae8f7548f2fbad89317bd61a7dee1fa5d26 Mon Sep 17 00:00:00 2001
From: wedjat <wedjat@protonmail.com>
Date: Sat, 21 Jul 2018 10:37:47 +0200
Subject: [PATCH 04/19] Updated to 1.1.0

---
 .SRCINFO | 6 +++---
 PKGBUILD | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index cf36012..04cf4f2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = python-pydicom
 	pkgdesc = Pure python package for working with DICOM files
-	pkgver = 1.0.2
+	pkgver = 1.1.0
 	pkgrel = 1
 	url = https://pydicom.github.io/pydicom/stable/index.html
 	arch = x86_64
@@ -9,9 +9,9 @@ pkgbase = python-pydicom
 	makedepends = python-setuptools
 	depends = python
 	depends = python-numpy
-	source = python-pydicom-1.0.2.tar.gz::https://github.com/pydicom/pydicom/archive/v1.0.2.tar.gz
+	source = python-pydicom-1.1.0.tar.gz::https://github.com/pydicom/pydicom/archive/v1.1.0.tar.gz
 	source = file://license.txt
-	md5sums = f6381a6a82b8bd8ac6558db2042c8ebb
+	md5sums = 759799fbe1d01d1daadeca649717122b
 	md5sums = dee3b5d8029934bd8195cd244b966055
 
 pkgname = python-pydicom
diff --git a/PKGBUILD b/PKGBUILD
index 0c06d77..14c6790 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
+# Maintainer: Bert Peters <bert@bertptrs.nl>
 # Maintainer: wedjat <wedjat@protonmail.com>
 # Contributor: Andrzej Giniewicz <gginiu@gmail.com>
 pkgname=python-pydicom
-pkgver=1.0.2
+pkgver=1.1.0
 pkgrel=1
 pkgdesc="Pure python package for working with DICOM files"
 arch=("x86_64")
@@ -12,9 +13,8 @@ makedepends=('python-setuptools')
 optdepends=()
 options=()
 source=("$pkgname-$pkgver.tar.gz::https://github.com/pydicom/pydicom/archive/v$pkgver.tar.gz" "file://license.txt")
-md5sums=('f6381a6a82b8bd8ac6558db2042c8ebb'
+md5sums=('759799fbe1d01d1daadeca649717122b'
          'dee3b5d8029934bd8195cd244b966055')
-
 prepare() 
 {
 	cd "$srcdir/pydicom-$pkgver"

From 23b5b430e92ba450c252892575ba1e55109e54f2 Mon Sep 17 00:00:00 2001
From: Bert Peters <bert@bertptrs.nl>
Date: Mon, 23 Jul 2018 10:12:52 +0200
Subject: [PATCH 05/19] Add split package and unit testing.

---
 .SRCINFO    | 14 ++++++++----
 PKGBUILD    | 51 +++++++++++++++++++++++++++++---------------
 license.txt | 61 -----------------------------------------------------
 3 files changed, 44 insertions(+), 82 deletions(-)
 delete mode 100644 license.txt

diff --git a/.SRCINFO b/.SRCINFO
index 04cf4f2..3f5dcf2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,24 @@
 pkgbase = python-pydicom
 	pkgdesc = Pure python package for working with DICOM files
 	pkgver = 1.1.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://pydicom.github.io/pydicom/stable/index.html
 	arch = x86_64
 	license = MIT
 	license = custom
+	checkdepends = python-pytest
 	makedepends = python-setuptools
+	makedepends = python2-setuptools
 	depends = python
-	depends = python-numpy
+	optdepends = python-numpy: for working with pixel data
+	optdepends = python-pillow: for working with compressed image data
 	source = python-pydicom-1.1.0.tar.gz::https://github.com/pydicom/pydicom/archive/v1.1.0.tar.gz
-	source = file://license.txt
 	md5sums = 759799fbe1d01d1daadeca649717122b
-	md5sums = dee3b5d8029934bd8195cd244b966055
 
 pkgname = python-pydicom
 
+pkgname = python2-pydicom
+	depends = python2
+	optdepends = python2-numpy: for working with pixel data
+	optdepends = python2-pillow: for working with compressed image data
+
diff --git a/PKGBUILD b/PKGBUILD
index 14c6790..e0cc096 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,53 @@
 # Maintainer: Bert Peters <bert@bertptrs.nl>
 # Maintainer: wedjat <wedjat@protonmail.com>
 # Contributor: Andrzej Giniewicz <gginiu@gmail.com>
-pkgname=python-pydicom
+pkgname=('python-pydicom' 'python2-pydicom')
 pkgver=1.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Pure python package for working with DICOM files"
 arch=("x86_64")
 url="https://pydicom.github.io/pydicom/stable/index.html"
 license=('MIT' 'custom')
-depends=('python' 'python-numpy')
-makedepends=('python-setuptools')
-optdepends=()
-options=()
-source=("$pkgname-$pkgver.tar.gz::https://github.com/pydicom/pydicom/archive/v$pkgver.tar.gz" "file://license.txt")
-md5sums=('759799fbe1d01d1daadeca649717122b'
-         'dee3b5d8029934bd8195cd244b966055')
-prepare() 
-{
-	cd "$srcdir/pydicom-$pkgver"
-	sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python|"  $(find -name '*.py')
-}
+depends=('python')
+makedepends=('python-setuptools' 'python2-setuptools')
+optdepends=('python-numpy: for working with pixel data'
+            'python-pillow: for working with compressed image data')
+checkdepends=('python-pytest')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/pydicom/pydicom/archive/v$pkgver.tar.gz")
+md5sums=('759799fbe1d01d1daadeca649717122b')
 
-build() 
+build()
 {
 	cd "$srcdir/pydicom-$pkgver"
 	python setup.py build
 }
 
-package() 
+package_python-pydicom()
 {
 	cd "$srcdir/pydicom-$pkgver"
 	python setup.py install --skip-build --root="$pkgdir"/ --optimize=1
 
-        install -D "$srcdir/pydicom-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+	install -D "$srcdir/pydicom-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_python2-pydicom()
+{
+	depends=('python2')
+	optdepends=('python2-numpy: for working with pixel data'
+                'python2-pillow: for working with compressed image data')
+	cd "$srcdir/pydicom-$pkgver"
+	python2 setup.py install --skip-build --root="$pkgdir"/ --optimize=1
+
+	install -D "$srcdir/pydicom-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+
+check()
+{
+	cd "$srcdir/pydicom-$pkgver"
+	# Test suite has a known issue with Pillow 5 and up
+	# See: https://github.com/pydicom/pydicom/issues/663
+	# Don't write byte code to prevent a "$srcdir in pkg" error on rebuilds
+	PYTHONDONTWRITEBYTECODE=1 \
+		pytest --deselect=pydicom/tests/test_pillow_pixel_data.py::test_PI_RGB[JPEG_RGB_RGB]
 }
diff --git a/license.txt b/license.txt
deleted file mode 100644
index dfa0394..0000000
--- a/license.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-License file for pydicom, a pure-python DICOM library
-
-Copyright (c) 2008-2017 Darcy Mason and pydicom contributors
-
-Except for portions outlined below, pydicom is released under an MIT license:
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-Portions of pydicom (private dictionary file(s)) were generated from the 
-private dictionary of the GDCM library, released under the following license:
-
-  Program: GDCM (Grassroots DICOM). A DICOM library
-  Module:  http://gdcm.sourceforge.net/Copyright.html
-
-Copyright (c) 2006-2010 Mathieu Malaterre
-Copyright (c) 1993-2005 CREATIS
-(CREATIS = Centre de Recherche et d'Applications en Traitement de l'Image)
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
- * Neither name of Mathieu Malaterre, or CREATIS, nor the names of any
-   contributors (CNRS, INSERM, UCB, Universite Lyon I), may be used to
-   endorse or promote products derived from this software without specific
-   prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-

From de05f45f4043b9ee95dedf7306d106e707b1c02a Mon Sep 17 00:00:00 2001
From: Bert Peters <bert@bertptrs.nl>
Date: Fri, 10 Aug 2018 11:30:38 +0200
Subject: [PATCH 06/19] Fix Python 3.7 incompatibility.

---
 .SRCINFO | 2 +-
 PKGBUILD | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 3f5dcf2..e797b93 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = python-pydicom
 	pkgdesc = Pure python package for working with DICOM files
 	pkgver = 1.1.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://pydicom.github.io/pydicom/stable/index.html
 	arch = x86_64
 	license = MIT
diff --git a/PKGBUILD b/PKGBUILD
index e0cc096..32af00c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Andrzej Giniewicz <gginiu@gmail.com>
 pkgname=('python-pydicom' 'python2-pydicom')
 pkgver=1.1.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Pure python package for working with DICOM files"
 arch=("x86_64")
 url="https://pydicom.github.io/pydicom/stable/index.html"
@@ -47,7 +47,9 @@ check()
 	cd "$srcdir/pydicom-$pkgver"
 	# Test suite has a known issue with Pillow 5 and up
 	# See: https://github.com/pydicom/pydicom/issues/663
+	# Timezone test isn't supposed to run in python 3, but it does
 	# Don't write byte code to prevent a "$srcdir in pkg" error on rebuilds
 	PYTHONDONTWRITEBYTECODE=1 \
-		pytest --deselect=pydicom/tests/test_pillow_pixel_data.py::test_PI_RGB[JPEG_RGB_RGB]
+		pytest --deselect=pydicom/tests/test_pillow_pixel_data.py::test_PI_RGB[JPEG_RGB_RGB] \
+			--deselect pydicom/tests/test_fixes.py::TestTimeZone::test_constructor
 }

From 1443a2dc2de04ed140a5f7143b7200d38831fda5 Mon Sep 17 00:00:00 2001
From: Bert Peters <bert@bertptrs.nl>
Date: Sun, 7 Oct 2018 16:45:10 +0200
Subject: [PATCH 07/19] Update to 1.2.0.

New version fixed the unit tests, so no longer need to deselect those.
---
 .SRCINFO |  8 ++++----
 PKGBUILD | 14 ++++----------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index e797b93..567e4f2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = python-pydicom
 	pkgdesc = Pure python package for working with DICOM files
-	pkgver = 1.1.0
-	pkgrel = 3
+	pkgver = 1.2.0
+	pkgrel = 1
 	url = https://pydicom.github.io/pydicom/stable/index.html
 	arch = x86_64
 	license = MIT
@@ -12,8 +12,8 @@ pkgbase = python-pydicom
 	depends = python
 	optdepends = python-numpy: for working with pixel data
 	optdepends = python-pillow: for working with compressed image data
-	source = python-pydicom-1.1.0.tar.gz::https://github.com/pydicom/pydicom/archive/v1.1.0.tar.gz
-	md5sums = 759799fbe1d01d1daadeca649717122b
+	source = python-pydicom-1.2.0.tar.gz::https://github.com/pydicom/pydicom/archive/v1.2.0.tar.gz
+	md5sums = edbdde15650b4a071de40dfea474bdcc
 
 pkgname = python-pydicom
 
diff --git a/PKGBUILD b/PKGBUILD
index 32af00c..4b0abdf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Maintainer: wedjat <wedjat@protonmail.com>
 # Contributor: Andrzej Giniewicz <gginiu@gmail.com>
 pkgname=('python-pydicom' 'python2-pydicom')
-pkgver=1.1.0
-pkgrel=3
+pkgver=1.2.0
+pkgrel=1
 pkgdesc="Pure python package for working with DICOM files"
 arch=("x86_64")
 url="https://pydicom.github.io/pydicom/stable/index.html"
@@ -14,7 +14,7 @@ optdepends=('python-numpy: for working with pixel data'
             'python-pillow: for working with compressed image data')
 checkdepends=('python-pytest')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/pydicom/pydicom/archive/v$pkgver.tar.gz")
-md5sums=('759799fbe1d01d1daadeca649717122b')
+md5sums=('edbdde15650b4a071de40dfea474bdcc')
 
 build()
 {
@@ -45,11 +45,5 @@ package_python2-pydicom()
 check()
 {
 	cd "$srcdir/pydicom-$pkgver"
-	# Test suite has a known issue with Pillow 5 and up
-	# See: https://github.com/pydicom/pydicom/issues/663
-	# Timezone test isn't supposed to run in python 3, but it does
-	# Don't write byte code to prevent a "$srcdir in pkg" error on rebuilds
-	PYTHONDONTWRITEBYTECODE=1 \
-		pytest --deselect=pydicom/tests/test_pillow_pixel_data.py::test_PI_RGB[JPEG_RGB_RGB] \
-			--deselect pydicom/tests/test_fixes.py::TestTimeZone::test_constructor
+	PYTHONDONTWRITEBYTECODE=1 pytest
 }

From 90fd9e94c3d3cd950072545eaceaa2b82b43905f Mon Sep 17 00:00:00 2001
From: Bert Peters <bert@bertptrs.nl>
Date: Wed, 21 Nov 2018 13:12:20 +0100
Subject: [PATCH 08/19] Version 1.2.1.

Also corrected arch type, since this package does not contain
architecture-specific data.
---
 .SRCINFO | 8 ++++----
 PKGBUILD | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 567e4f2..c6cba43 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 pkgbase = python-pydicom
 	pkgdesc = Pure python package for working with DICOM files
-	pkgver = 1.2.0
+	pkgver = 1.2.1
 	pkgrel = 1
 	url = https://pydicom.github.io/pydicom/stable/index.html
-	arch = x86_64
+	arch = any
 	license = MIT
 	license = custom
 	checkdepends = python-pytest
@@ -12,8 +12,8 @@ pkgbase = python-pydicom
 	depends = python
 	optdepends = python-numpy: for working with pixel data
 	optdepends = python-pillow: for working with compressed image data
-	source = python-pydicom-1.2.0.tar.gz::https://github.com/pydicom/pydicom/archive/v1.2.0.tar.gz
-	md5sums = edbdde15650b4a071de40dfea474bdcc
+	source = python-pydicom-1.2.1.tar.gz::https://github.com/pydicom/pydicom/archive/v1.2.1.tar.gz
+	md5sums = 2f21c96fe0e7dd2a20983b3a665aa366
 
 pkgname = python-pydicom
 
diff --git a/PKGBUILD b/PKGBUILD
index 4b0abdf..c55cd73 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,10 +2,10 @@
 # Maintainer: wedjat <wedjat@protonmail.com>
 # Contributor: Andrzej Giniewicz <gginiu@gmail.com>
 pkgname=('python-pydicom' 'python2-pydicom')
-pkgver=1.2.0
+pkgver=1.2.1
 pkgrel=1
 pkgdesc="Pure python package for working with DICOM files"
-arch=("x86_64")
+arch=("any")
 url="https://pydicom.github.io/pydicom/stable/index.html"
 license=('MIT' 'custom')
 depends=('python')
@@ -14,7 +14,7 @@ optdepends=('python-numpy: for working with pixel data'
             'python-pillow: for working with compressed image data')
 checkdepends=('python-pytest')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/pydicom/pydicom/archive/v$pkgver.tar.gz")
-md5sums=('edbdde15650b4a071de40dfea474bdcc')
+md5sums=('2f21c96fe0e7dd2a20983b3a665aa366')
 
 build()
 {

From 09e2e6727a806bf0ab268a7fdcc4a7f91592dbe5 Mon Sep 17 00:00:00 2001
From: Bert Peters <bert@bertptrs.nl>
Date: Wed, 19 Dec 2018 05:58:45 +0100
Subject: [PATCH 09/19] Update to v1.2.2.

---
 .SRCINFO | 6 +++---
 PKGBUILD | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index c6cba43..a169dbf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = python-pydicom
 	pkgdesc = Pure python package for working with DICOM files
-	pkgver = 1.2.1
+	pkgver = 1.2.2
 	pkgrel = 1
 	url = https://pydicom.github.io/pydicom/stable/index.html
 	arch = any
@@ -12,8 +12,8 @@ pkgbase = python-pydicom
 	depends = python
 	optdepends = python-numpy: for working with pixel data
 	optdepends = python-pillow: for working with compressed image data
-	source = python-pydicom-1.2.1.tar.gz::https://github.com/pydicom/pydicom/archive/v1.2.1.tar.gz
-	md5sums = 2f21c96fe0e7dd2a20983b3a665aa366
+	source = python-pydicom-1.2.2.tar.gz::https://github.com/pydicom/pydicom/archive/v1.2.2.tar.gz
+	md5sums = f14bc9cde4e3c700e34807113e781a2b
 
 pkgname = python-pydicom
 
diff --git a/PKGBUILD b/PKGBUILD
index c55cd73..2ddb620 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: wedjat <wedjat@protonmail.com>
 # Contributor: Andrzej Giniewicz <gginiu@gmail.com>
 pkgname=('python-pydicom' 'python2-pydicom')
-pkgver=1.2.1
+pkgver=1.2.2
 pkgrel=1
 pkgdesc="Pure python package for working with DICOM files"
 arch=("any")
@@ -14,7 +14,7 @@ optdepends=('python-numpy: for working with pixel data'
             'python-pillow: for working with compressed image data')
 checkdepends=('python-pytest')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/pydicom/pydicom/archive/v$pkgver.tar.gz")
-md5sums=('2f21c96fe0e7dd2a20983b3a665aa366')
+md5sums=('f14bc9cde4e3c700e34807113e781a2b')
 
 build()
 {

From d409be04ccae0c8c6d4eb0c70d96267ea17d8460 Mon Sep 17 00:00:00 2001
From: Bert Peters <bert@bertptrs.nl>
Date: Sat, 13 Jul 2019 13:27:16 +0200
Subject: [PATCH 10/19] Update to 1.3.0.

---
 .SRCINFO | 6 +++---
 PKGBUILD | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index a169dbf..ed0689e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = python-pydicom
 	pkgdesc = Pure python package for working with DICOM files
-	pkgver = 1.2.2
+	pkgver = 1.3.0
 	pkgrel = 1
 	url = https://pydicom.github.io/pydicom/stable/index.html
 	arch = any
@@ -12,8 +12,8 @@ pkgbase = python-pydicom
 	depends = python
 	optdepends = python-numpy: for working with pixel data
 	optdepends = python-pillow: for working with compressed image data
-	source = python-pydicom-1.2.2.tar.gz::https://github.com/pydicom/pydicom/archive/v1.2.2.tar.gz
-	md5sums = f14bc9cde4e3c700e34807113e781a2b
+	source = python-pydicom-1.3.0.tar.gz::https://github.com/pydicom/pydicom/archive/1.3.0.tar.gz
+	md5sums = 08a8c176e8a4a80017c59adf3db9b75c
 
 pkgname = python-pydicom
 
diff --git a/PKGBUILD b/PKGBUILD
index 2ddb620..01f432d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: wedjat <wedjat@protonmail.com>
 # Contributor: Andrzej Giniewicz <gginiu@gmail.com>
 pkgname=('python-pydicom' 'python2-pydicom')
-pkgver=1.2.2
+pkgver=1.3.0
 pkgrel=1
 pkgdesc="Pure python package for working with DICOM files"
 arch=("any")
@@ -13,8 +13,8 @@ makedepends=('python-setuptools' 'python2-setuptools')
 optdepends=('python-numpy: for working with pixel data'
             'python-pillow: for working with compressed image data')
 checkdepends=('python-pytest')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/pydicom/pydicom/archive/v$pkgver.tar.gz")
-md5sums=('f14bc9cde4e3c700e34807113e781a2b')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/pydicom/pydicom/archive/$pkgver.tar.gz")
+md5sums=('08a8c176e8a4a80017c59adf3db9b75c')
 
 build()
 {

From 0e251c7a03cc4e88c20ba6f13d1ba5a6a98f47bc Mon Sep 17 00:00:00 2001
From: Bert Peters <bert@bertptrs.nl>
Date: Sun, 14 Jul 2019 00:10:56 +0200
Subject: [PATCH 11/19] New release tag.

---
 PKGBUILD | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index 01f432d..93945a6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Andrzej Giniewicz <gginiu@gmail.com>
 pkgname=('python-pydicom' 'python2-pydicom')
 pkgver=1.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Pure python package for working with DICOM files"
 arch=("any")
 url="https://pydicom.github.io/pydicom/stable/index.html"
@@ -13,8 +13,8 @@ makedepends=('python-setuptools' 'python2-setuptools')
 optdepends=('python-numpy: for working with pixel data'
             'python-pillow: for working with compressed image data')
 checkdepends=('python-pytest')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/pydicom/pydicom/archive/$pkgver.tar.gz")
-md5sums=('08a8c176e8a4a80017c59adf3db9b75c')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/pydicom/pydicom/archive/v$pkgver.tar.gz")
+md5sums=('74abb910bb283421491280099c1ad5f9')
 
 build()
 {

From cb697f9774008f092595c8f9fbf2b22ddc3b23db Mon Sep 17 00:00:00 2001
From: Bert Peters <bert@bertptrs.nl>
Date: Sun, 14 Jul 2019 00:11:19 +0200
Subject: [PATCH 12/19] Bump SRCINFO.

---
 .SRCINFO | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index ed0689e..09d7b9a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = python-pydicom
 	pkgdesc = Pure python package for working with DICOM files
 	pkgver = 1.3.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://pydicom.github.io/pydicom/stable/index.html
 	arch = any
 	license = MIT
@@ -12,8 +12,8 @@ pkgbase = python-pydicom
 	depends = python
 	optdepends = python-numpy: for working with pixel data
 	optdepends = python-pillow: for working with compressed image data
-	source = python-pydicom-1.3.0.tar.gz::https://github.com/pydicom/pydicom/archive/1.3.0.tar.gz
-	md5sums = 08a8c176e8a4a80017c59adf3db9b75c
+	source = python-pydicom-1.3.0.tar.gz::https://github.com/pydicom/pydicom/archive/v1.3.0.tar.gz
+	md5sums = 74abb910bb283421491280099c1ad5f9
 
 pkgname = python-pydicom
 

From e9ea37985a35ad3908ffc4c695b3d8c3f2c05e44 Mon Sep 17 00:00:00 2001
From: Bert Peters <bert@bertptrs.nl>
Date: Mon, 20 Jan 2020 22:31:28 +0100
Subject: [PATCH 13/19] Update to v1.4.0.

---
 .SRCINFO | 8 ++++----
 PKGBUILD | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 09d7b9a..a65482a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = python-pydicom
 	pkgdesc = Pure python package for working with DICOM files
-	pkgver = 1.3.0
-	pkgrel = 2
+	pkgver = 1.4.0
+	pkgrel = 1
 	url = https://pydicom.github.io/pydicom/stable/index.html
 	arch = any
 	license = MIT
@@ -12,8 +12,8 @@ pkgbase = python-pydicom
 	depends = python
 	optdepends = python-numpy: for working with pixel data
 	optdepends = python-pillow: for working with compressed image data
-	source = python-pydicom-1.3.0.tar.gz::https://github.com/pydicom/pydicom/archive/v1.3.0.tar.gz
-	md5sums = 74abb910bb283421491280099c1ad5f9
+	source = python-pydicom-1.4.0.tar.gz::https://github.com/pydicom/pydicom/archive/v1.4.0.tar.gz
+	md5sums = ba2c734469cea825ba59daf383d7593f
 
 pkgname = python-pydicom
 
diff --git a/PKGBUILD b/PKGBUILD
index 93945a6..cea0f85 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Maintainer: wedjat <wedjat@protonmail.com>
 # Contributor: Andrzej Giniewicz <gginiu@gmail.com>
 pkgname=('python-pydicom' 'python2-pydicom')
-pkgver=1.3.0
-pkgrel=2
+pkgver=1.4.0
+pkgrel=1
 pkgdesc="Pure python package for working with DICOM files"
 arch=("any")
 url="https://pydicom.github.io/pydicom/stable/index.html"
@@ -14,7 +14,7 @@ optdepends=('python-numpy: for working with pixel data'
             'python-pillow: for working with compressed image data')
 checkdepends=('python-pytest')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/pydicom/pydicom/archive/v$pkgver.tar.gz")
-md5sums=('74abb910bb283421491280099c1ad5f9')
+md5sums=('ba2c734469cea825ba59daf383d7593f')
 
 build()
 {

From cee19d216c6c0e17ad48b50ddf5f0f8dd71b2a15 Mon Sep 17 00:00:00 2001
From: Bert Peters <bert@bertptrs.nl>
Date: Mon, 20 Jan 2020 23:20:14 +0100
Subject: [PATCH 14/19] Update to v1.4.1.

---
 .SRCINFO | 6 +++---
 PKGBUILD | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index a65482a..ca00211 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = python-pydicom
 	pkgdesc = Pure python package for working with DICOM files
-	pkgver = 1.4.0
+	pkgver = 1.4.1
 	pkgrel = 1
 	url = https://pydicom.github.io/pydicom/stable/index.html
 	arch = any
@@ -12,8 +12,8 @@ pkgbase = python-pydicom
 	depends = python
 	optdepends = python-numpy: for working with pixel data
 	optdepends = python-pillow: for working with compressed image data
-	source = python-pydicom-1.4.0.tar.gz::https://github.com/pydicom/pydicom/archive/v1.4.0.tar.gz
-	md5sums = ba2c734469cea825ba59daf383d7593f
+	source = python-pydicom-1.4.1.tar.gz::https://github.com/pydicom/pydicom/archive/v1.4.1.tar.gz
+	md5sums = 42edfddd2350d18262a7923a34578a59
 
 pkgname = python-pydicom
 
diff --git a/PKGBUILD b/PKGBUILD
index cea0f85..b5fdbae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: wedjat <wedjat@protonmail.com>
 # Contributor: Andrzej Giniewicz <gginiu@gmail.com>
 pkgname=('python-pydicom' 'python2-pydicom')
-pkgver=1.4.0
+pkgver=1.4.1
 pkgrel=1
 pkgdesc="Pure python package for working with DICOM files"
 arch=("any")
@@ -14,7 +14,7 @@ optdepends=('python-numpy: for working with pixel data'
             'python-pillow: for working with compressed image data')
 checkdepends=('python-pytest')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/pydicom/pydicom/archive/v$pkgver.tar.gz")
-md5sums=('ba2c734469cea825ba59daf383d7593f')
+md5sums=('42edfddd2350d18262a7923a34578a59')
 
 build()
 {

From 24a1677a721d3cb773d44bd52ae68b0e56809c2a Mon Sep 17 00:00:00 2001
From: Bert Peters <bert@bertptrs.nl>
Date: Sat, 22 Feb 2020 16:51:47 +0100
Subject: [PATCH 15/19] Update to v1.41.2.

---
 .SRCINFO | 6 +++---
 PKGBUILD | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index ca00211..b7bae86 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = python-pydicom
 	pkgdesc = Pure python package for working with DICOM files
-	pkgver = 1.4.1
+	pkgver = 1.4.2
 	pkgrel = 1
 	url = https://pydicom.github.io/pydicom/stable/index.html
 	arch = any
@@ -12,8 +12,8 @@ pkgbase = python-pydicom
 	depends = python
 	optdepends = python-numpy: for working with pixel data
 	optdepends = python-pillow: for working with compressed image data
-	source = python-pydicom-1.4.1.tar.gz::https://github.com/pydicom/pydicom/archive/v1.4.1.tar.gz
-	md5sums = 42edfddd2350d18262a7923a34578a59
+	source = python-pydicom-1.4.2.tar.gz::https://github.com/pydicom/pydicom/archive/v1.4.2.tar.gz
+	md5sums = dc5c3e61f6dd6db4b92f34c8026b6e8a
 
 pkgname = python-pydicom
 
diff --git a/PKGBUILD b/PKGBUILD
index b5fdbae..332cdfb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: wedjat <wedjat@protonmail.com>
 # Contributor: Andrzej Giniewicz <gginiu@gmail.com>
 pkgname=('python-pydicom' 'python2-pydicom')
-pkgver=1.4.1
+pkgver=1.4.2
 pkgrel=1
 pkgdesc="Pure python package for working with DICOM files"
 arch=("any")
@@ -14,7 +14,7 @@ optdepends=('python-numpy: for working with pixel data'
             'python-pillow: for working with compressed image data')
 checkdepends=('python-pytest')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/pydicom/pydicom/archive/v$pkgver.tar.gz")
-md5sums=('42edfddd2350d18262a7923a34578a59')
+md5sums=('dc5c3e61f6dd6db4b92f34c8026b6e8a')
 
 build()
 {

From 2dcb7272b0ba6f0b752a61755229658e31212125 Mon Sep 17 00:00:00 2001
From: Bert Peters <bert@bertptrs.nl>
Date: Sat, 30 May 2020 10:33:38 +0200
Subject: [PATCH 16/19] Update to v2.0.0.

This version dropped python 2 support and so does this package.
---
 .SRCINFO | 12 +++---------
 PKGBUILD | 22 +++++-----------------
 2 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index b7bae86..5fc3f8f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = python-pydicom
 	pkgdesc = Pure python package for working with DICOM files
-	pkgver = 1.4.2
+	pkgver = 2.0.0
 	pkgrel = 1
 	url = https://pydicom.github.io/pydicom/stable/index.html
 	arch = any
@@ -8,17 +8,11 @@ pkgbase = python-pydicom
 	license = custom
 	checkdepends = python-pytest
 	makedepends = python-setuptools
-	makedepends = python2-setuptools
 	depends = python
 	optdepends = python-numpy: for working with pixel data
 	optdepends = python-pillow: for working with compressed image data
-	source = python-pydicom-1.4.2.tar.gz::https://github.com/pydicom/pydicom/archive/v1.4.2.tar.gz
-	md5sums = dc5c3e61f6dd6db4b92f34c8026b6e8a
+	source = python-pydicom-2.0.0.tar.gz::https://github.com/pydicom/pydicom/archive/v2.0.0.tar.gz
+	md5sums = 57262b6846904fd14647430363c2319a
 
 pkgname = python-pydicom
 
-pkgname = python2-pydicom
-	depends = python2
-	optdepends = python2-numpy: for working with pixel data
-	optdepends = python2-pillow: for working with compressed image data
-
diff --git a/PKGBUILD b/PKGBUILD
index 332cdfb..9766814 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,20 @@
 # Maintainer: Bert Peters <bert@bertptrs.nl>
 # Maintainer: wedjat <wedjat@protonmail.com>
 # Contributor: Andrzej Giniewicz <gginiu@gmail.com>
-pkgname=('python-pydicom' 'python2-pydicom')
-pkgver=1.4.2
+pkgname=python-pydicom
+pkgver=2.0.0
 pkgrel=1
 pkgdesc="Pure python package for working with DICOM files"
 arch=("any")
 url="https://pydicom.github.io/pydicom/stable/index.html"
 license=('MIT' 'custom')
 depends=('python')
-makedepends=('python-setuptools' 'python2-setuptools')
+makedepends=('python-setuptools')
 optdepends=('python-numpy: for working with pixel data'
             'python-pillow: for working with compressed image data')
 checkdepends=('python-pytest')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/pydicom/pydicom/archive/v$pkgver.tar.gz")
-md5sums=('dc5c3e61f6dd6db4b92f34c8026b6e8a')
+md5sums=('57262b6846904fd14647430363c2319a')
 
 build()
 {
@@ -22,7 +22,7 @@ build()
 	python setup.py build
 }
 
-package_python-pydicom()
+package()
 {
 	cd "$srcdir/pydicom-$pkgver"
 	python setup.py install --skip-build --root="$pkgdir"/ --optimize=1
@@ -30,18 +30,6 @@ package_python-pydicom()
 	install -D "$srcdir/pydicom-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
-package_python2-pydicom()
-{
-	depends=('python2')
-	optdepends=('python2-numpy: for working with pixel data'
-                'python2-pillow: for working with compressed image data')
-	cd "$srcdir/pydicom-$pkgver"
-	python2 setup.py install --skip-build --root="$pkgdir"/ --optimize=1
-
-	install -D "$srcdir/pydicom-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-
 check()
 {
 	cd "$srcdir/pydicom-$pkgver"

From f11b11498360c1ca446e7181299fb624a1e9ca65 Mon Sep 17 00:00:00 2001
From: Bert Peters <bert@bertptrs.nl>
Date: Mon, 2 Nov 2020 19:11:46 +0100
Subject: [PATCH 17/19] Update to 2.1.0.

---
 .SRCINFO | 6 +++---
 PKGBUILD | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 5fc3f8f..22079aa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = python-pydicom
 	pkgdesc = Pure python package for working with DICOM files
-	pkgver = 2.0.0
+	pkgver = 2.1.0
 	pkgrel = 1
 	url = https://pydicom.github.io/pydicom/stable/index.html
 	arch = any
@@ -11,8 +11,8 @@ pkgbase = python-pydicom
 	depends = python
 	optdepends = python-numpy: for working with pixel data
 	optdepends = python-pillow: for working with compressed image data
-	source = python-pydicom-2.0.0.tar.gz::https://github.com/pydicom/pydicom/archive/v2.0.0.tar.gz
-	md5sums = 57262b6846904fd14647430363c2319a
+	source = python-pydicom-2.1.0.tar.gz::https://github.com/pydicom/pydicom/archive/v2.1.0.tar.gz
+	md5sums = f86312e7727fea69eaeb9f5ccc45e0eb
 
 pkgname = python-pydicom
 
diff --git a/PKGBUILD b/PKGBUILD
index 9766814..63185df 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: wedjat <wedjat@protonmail.com>
 # Contributor: Andrzej Giniewicz <gginiu@gmail.com>
 pkgname=python-pydicom
-pkgver=2.0.0
+pkgver=2.1.0
 pkgrel=1
 pkgdesc="Pure python package for working with DICOM files"
 arch=("any")
@@ -14,7 +14,7 @@ optdepends=('python-numpy: for working with pixel data'
             'python-pillow: for working with compressed image data')
 checkdepends=('python-pytest')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/pydicom/pydicom/archive/v$pkgver.tar.gz")
-md5sums=('57262b6846904fd14647430363c2319a')
+md5sums=('f86312e7727fea69eaeb9f5ccc45e0eb')
 
 build()
 {

From 3651e7a545e8d7e7259b17a639b00f78b3baf11c Mon Sep 17 00:00:00 2001
From: Bert Peters <bert@bertptrs.nl>
Date: Fri, 6 Nov 2020 22:08:54 +0100
Subject: [PATCH 18/19] Update to v2.1.1.

---
 .SRCINFO | 6 +++---
 PKGBUILD | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 22079aa..dc4000e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = python-pydicom
 	pkgdesc = Pure python package for working with DICOM files
-	pkgver = 2.1.0
+	pkgver = 2.1.1
 	pkgrel = 1
 	url = https://pydicom.github.io/pydicom/stable/index.html
 	arch = any
@@ -11,8 +11,8 @@ pkgbase = python-pydicom
 	depends = python
 	optdepends = python-numpy: for working with pixel data
 	optdepends = python-pillow: for working with compressed image data
-	source = python-pydicom-2.1.0.tar.gz::https://github.com/pydicom/pydicom/archive/v2.1.0.tar.gz
-	md5sums = f86312e7727fea69eaeb9f5ccc45e0eb
+	source = python-pydicom-2.1.1.tar.gz::https://github.com/pydicom/pydicom/archive/v2.1.1.tar.gz
+	md5sums = 3f8d0fecf6f58bdabbe2e853d97356ff
 
 pkgname = python-pydicom
 
diff --git a/PKGBUILD b/PKGBUILD
index 63185df..7a8405e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: wedjat <wedjat@protonmail.com>
 # Contributor: Andrzej Giniewicz <gginiu@gmail.com>
 pkgname=python-pydicom
-pkgver=2.1.0
+pkgver=2.1.1
 pkgrel=1
 pkgdesc="Pure python package for working with DICOM files"
 arch=("any")
@@ -14,7 +14,7 @@ optdepends=('python-numpy: for working with pixel data'
             'python-pillow: for working with compressed image data')
 checkdepends=('python-pytest')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/pydicom/pydicom/archive/v$pkgver.tar.gz")
-md5sums=('f86312e7727fea69eaeb9f5ccc45e0eb')
+md5sums=('3f8d0fecf6f58bdabbe2e853d97356ff')
 
 build()
 {

From 2e8d7fe8822869a52b6f9e6d88365c6d2e682423 Mon Sep 17 00:00:00 2001
From: Bert Peters <bert@bertptrs.nl>
Date: Wed, 9 Dec 2020 21:51:49 +0100
Subject: [PATCH 19/19] Update to v2.1.2.

---
 .SRCINFO | 6 +++---
 PKGBUILD | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index dc4000e..ca69063 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = python-pydicom
 	pkgdesc = Pure python package for working with DICOM files
-	pkgver = 2.1.1
+	pkgver = 2.1.2
 	pkgrel = 1
 	url = https://pydicom.github.io/pydicom/stable/index.html
 	arch = any
@@ -11,8 +11,8 @@ pkgbase = python-pydicom
 	depends = python
 	optdepends = python-numpy: for working with pixel data
 	optdepends = python-pillow: for working with compressed image data
-	source = python-pydicom-2.1.1.tar.gz::https://github.com/pydicom/pydicom/archive/v2.1.1.tar.gz
-	md5sums = 3f8d0fecf6f58bdabbe2e853d97356ff
+	source = python-pydicom-2.1.2.tar.gz::https://github.com/pydicom/pydicom/archive/v2.1.2.tar.gz
+	md5sums = 398d943c9da2aec28857b60fe7e02123
 
 pkgname = python-pydicom
 
diff --git a/PKGBUILD b/PKGBUILD
index 7a8405e..ce4c854 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: wedjat <wedjat@protonmail.com>
 # Contributor: Andrzej Giniewicz <gginiu@gmail.com>
 pkgname=python-pydicom
-pkgver=2.1.1
+pkgver=2.1.2
 pkgrel=1
 pkgdesc="Pure python package for working with DICOM files"
 arch=("any")
@@ -14,7 +14,7 @@ optdepends=('python-numpy: for working with pixel data'
             'python-pillow: for working with compressed image data')
 checkdepends=('python-pytest')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/pydicom/pydicom/archive/v$pkgver.tar.gz")
-md5sums=('3f8d0fecf6f58bdabbe2e853d97356ff')
+md5sums=('398d943c9da2aec28857b60fe7e02123')
 
 build()
 {