Updating to 3.6.3

2 files changed, 10 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 97c106ae399e..0e0888982b76 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = dcmtk
 	pkgdesc = A collection of libraries and applications implementing large parts the DICOM standard
-	pkgver = 3.6.2
+	pkgver = 3.6.3
 	pkgrel = 1
 	url = http://dicom.offis.de/dcmtk
 	arch = i686
@@ -13,14 +13,10 @@ pkgbase = dcmtk
 	depends = libtiff
 	depends = libxml2
 	depends = openssl
-	depends = charls
 	depends = libssh
-	noextract = dcmtk-3.6.2-1.fc28.src.rpm
 	options = !buildflags
-	source = ftp://dicom.offis.de/pub/dicom/offis/software/dcmtk/dcmtk362/dcmtk-3.6.2.tar.gz
-	source = http://kojipkgs.fedoraproject.org/packages/dcmtk/3.6.2/1.fc28/src/dcmtk-3.6.2-1.fc28.src.rpm
-	sha512sums = a3190287b068ae17984909dd9e8d920ddea3b590fc3888c42fc33fca4a3cdcf7dcc9bd64d994620303eef7c7ab7b4184ac21ebd1167ae2c17e4a88f641d7ef94
-	sha512sums = 403b844a003c90afa696e4739fd687f0ea2ce8dd76e473c384738ab4190857ba39ea553e6eeaff39b8b2ddfe420aae1c131a14f7c622f34a2f6863f142cc1382
+	source = ftp://dicom.offis.de/pub/dicom/offis/software/dcmtk/dcmtk363/dcmtk-3.6.3.tar.gz
+	sha512sums = 5b907422d2d80e417ae8239e159d1300da4ed8db7e92cee619cc1d37116165e8824f8a9103605e07a95b1bffe94bbd2d5e05125f068281d241e8e78755d0b5e8
 
 pkgname = dcmtk
 
diff --git a/PKGBUILD b/PKGBUILD
index c233f369df71..5e3ed17da2a3 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,58 +2,23 @@
 # Maintainer: Miguel Useche <migueluseche@skatox.com>
 # Contributor: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
 
-# Most of this PKGBUILD + patches were taken from Fedora's dcmtk spec file, so thanks to the Fedora packagers for making this package work!
-
 pkgname=dcmtk
-pkgver=3.6.2
-
-# Fedora release (from Koji)
-_fedora_rel=1.fc28
-# Newer Fedora releases in the future can be found at http://koji.fedoraproject.org/
-
+pkgver=3.6.3
 pkgrel=1
 pkgdesc="A collection of libraries and applications implementing large parts the DICOM standard"
 arch=('i686' 'x86_64')
 url="http://dicom.offis.de/dcmtk"
 license=('other')
-depends=('zlib' 'libpng' 'libtiff' 'libxml2' 'openssl' 'charls' 'libssh')
+depends=('zlib' 'libpng' 'libtiff' 'libxml2' 'openssl' 'libssh')
 makedepends=('cmake' 'make')
-source=("ftp://dicom.offis.de/pub/dicom/offis/software/dcmtk/dcmtk362/${pkgname}-${pkgver}.tar.gz" "http://kojipkgs.fedoraproject.org/packages/dcmtk/${pkgver}/${_fedora_rel}/src/${pkgname}-${pkgver}-${_fedora_rel}.src.rpm")
-noextract=("${pkgname}-${pkgver}-${_fedora_rel}.src.rpm")
-sha512sums=('a3190287b068ae17984909dd9e8d920ddea3b590fc3888c42fc33fca4a3cdcf7dcc9bd64d994620303eef7c7ab7b4184ac21ebd1167ae2c17e4a88f641d7ef94' '403b844a003c90afa696e4739fd687f0ea2ce8dd76e473c384738ab4190857ba39ea553e6eeaff39b8b2ddfe420aae1c131a14f7c622f34a2f6863f142cc1382')
+source=("ftp://dicom.offis.de/pub/dicom/offis/software/dcmtk/dcmtk363/${pkgname}-${pkgver}.tar.gz")
+sha512sums=('5b907422d2d80e417ae8239e159d1300da4ed8db7e92cee619cc1d37116165e8824f8a9103605e07a95b1bffe94bbd2d5e05125f068281d241e8e78755d0b5e8')
+
 #Currently it's not building otherwise
 options=(!buildflags)
 
 build() {
-  cd "${srcdir}"
-
-   # Extract RPM into another directory
-  if [ ! -d fedora ]; then 
-    mkdir fedora
-  fi
-  
-  pushd fedora
-  bsdtar -xf "../${pkgname}-${pkgver}-${_fedora_rel}.src.rpm"
-  popd
-
-  sum_original=`sha512sum "${srcdir}/fedora/${pkgname}-${pkgver}.tar.gz" | awk '{print $1}'`
-  sum_fedora=`sha512sum "${srcdir}/${pkgname}-${pkgver}.tar.gz" | awk '{print $1}'`
-
-  # Verify the authenticity of both the Fedora source and the upstream source
-  if [[ $sum_fedora != $sum_original ]]; then
-    error "sha512 sums of Fedora's source and upstream source do not match!"
-    exit
-  fi
-
-  cd "${pkgname}-${pkgver}"
-
-  # Apply Fedora patches (fixes build)
-  for i in $(cat "${srcdir}/fedora/${pkgname}.spec" | grep "Patch[0-9]*:" | awk '{print $2}'); do
-    patch -p1 -i "${srcdir}/fedora/${i}"
-  done
-
-  # Remove bundled charls
-  rm -rf dcmjpls/libcharls/
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   # Fix linker flags
   export LDFLAGS="-lssh -lz ${LDFLAGS}"
@@ -90,4 +55,4 @@ package() {
   # Install ld config file
   install -dm755 "${pkgdir}/etc/ld.so.conf.d/"
   echo "/usr/lib/" > "${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf"
-}
+}
\ No newline at end of file