use openssl 1.1

2 files changed, 20 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6063bbd4e36d..afc90439a6fd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,16 @@
 pkgbase = libdigidocpp
-	pkgdesc = Library for creating DigiDoc signature files
+	pkgdesc = Library for creating, signing and verification of digitally signed documents, according to XAdES and XML-DSIG standards.
 	pkgver = 3.13.2.1355
-	pkgrel = 2
+	pkgrel = 4
 	url = http://www.id.ee/
 	arch = x86_64
 	arch = i686
 	license = LGPL
 	makedepends = cmake
 	makedepends = xsd>=4.0
-	makedepends = pcsclite
-	makedepends = opensc
 	makedepends = xxd
 	depends = xml-security-c
-	depends = libdigidoc
 	source = https://installer.id.ee/media/ubuntu/pool/main/libd/libdigidocpp/libdigidocpp_3.13.2.1355.orig.tar.xz
-	validpgpkeys = 43650273CE9516880D7EB581B339B36D592073D4
 	sha256sums = 5f48ecaf79813a6bbd267479dd21ca0a0a984c41ac37587e5b29dc8b688096c2
 
 pkgname = libdigidocpp
diff --git a/PKGBUILD b/PKGBUILD
index 6e91aad4a910..27fab21c7790 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,34 @@
 # Maintainer: kevku <kevku@gmx.com>
 pkgname=libdigidocpp
 pkgver=3.13.2.1355
-pkgrel=2
-pkgdesc="Library for creating DigiDoc signature files"
+pkgrel=4
+pkgdesc="Library for creating, signing and verification of digitally signed documents, according to XAdES and XML-DSIG standards."
 arch=('x86_64' 'i686')
 url="http://www.id.ee/"
 license=('LGPL')
-depends=('xml-security-c' 'libdigidoc')
-makedepends=('cmake' 'xsd>=4.0' 'pcsclite' 'opensc' 'xxd')
+depends=('xml-security-c')
+makedepends=('cmake' 'xsd>=4.0' 'xxd')
 source=("https://installer.id.ee/media/ubuntu/pool/main/libd/$pkgname/${pkgname}_$pkgver.orig.tar.xz")
 sha256sums=('5f48ecaf79813a6bbd267479dd21ca0a0a984c41ac37587e5b29dc8b688096c2')
-validpgpkeys=('43650273CE9516880D7EB581B339B36D592073D4')
+
+prepare() {
+  [[ -d "$pkgname-build" ]] && rm -r "$pkgname-build"
+  mkdir "$pkgname-build"
+}
 
 build() {
-  cd "$srcdir/"
-  export PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig
-  cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR="lib" -DCMAKE_INSTALL_SYSCONFDIR="/etc" -DINSTALL_DOC=NO -DSWIG_EXECUTABLE="" -DBoost_INCLUDE_DIR="" -DMINIZIP_INCLUDE_DIR=""
+  cd "$pkgname-build"
+  cmake .. -DCMAKE_INSTALL_PREFIX="/usr" \
+           -DCMAKE_INSTALL_LIBDIR="lib" \
+           -DCMAKE_INSTALL_SYSCONFDIR="/etc" \
+           -DSWIG_EXECUTABLE="" \
+           -DBoost_INCLUDE_DIR="" \
+           -DMINIZIP_INCLUDE_DIR="" \
+           -DLIBDIGIDOC_INCLUDE_DIR=""
   make
 }
 
 package() {
-  cd "$srcdir/"
+  cd "$pkgname-build"
   make DESTDIR="$pkgdir/" install
 }