From bbfb45b9d90860c56667824d965f80dd4b4081a9 Mon Sep 17 00:00:00 2001
From: Kent Fritz <fritz.kent@gmail.com>
Date: Sat, 28 Feb 2015 03:20:14 +0700
Subject: misc/xca: Updated for version 1.1.0.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 misc/xca/README          |  2 ++
 misc/xca/patch.configure | 11 -----------
 misc/xca/xca.SlackBuild  | 17 ++++++++++-------
 misc/xca/xca.info        |  6 +++---
 4 files changed, 15 insertions(+), 21 deletions(-)
 delete mode 100644 misc/xca/patch.configure

(limited to 'misc')

diff --git a/misc/xca/README b/misc/xca/README
index 009e673da1..29dbea29c9 100644
--- a/misc/xca/README
+++ b/misc/xca/README
@@ -6,3 +6,5 @@ Smartcards and CRLs.
 
 Some certificate templates and other data are located in 
 /usr/share/xca
+
+If you're upgrading, be sure to make a backup of your database!
diff --git a/misc/xca/patch.configure b/misc/xca/patch.configure
deleted file mode 100644
index a00cf030f5..0000000000
--- a/misc/xca/patch.configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2014-03-28 05:27:55.968017610 -0700
-+++ configure	2014-03-28 05:32:52.243020610 -0700
-@@ -189,7 +189,7 @@
-    pkg-config QtGui openssl --libs >/dev/null;
- then
-   CF="`pkg-config QtGui openssl --cflags`"
--  LIBS="`pkg-config QtGui openssl --libs` -lltdl"
-+  LIBS="`pkg-config QtGui openssl --libs` -lltdl ${LIBS}"
- else
-   by_hand=true
- fi
diff --git a/misc/xca/xca.SlackBuild b/misc/xca/xca.SlackBuild
index 691e7990e6..05605f5ccb 100644
--- a/misc/xca/xca.SlackBuild
+++ b/misc/xca/xca.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for xca
 
-# Copyright 2014 Kent Fritz, Mountain View, CA
+# Copyright 2014-2015 Kent Fritz, Mountain View, CA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=xca
-VERSION=${VERSION:-1.0.0}
+VERSION=${VERSION:-1.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -62,7 +62,6 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
-patch < $CWD/patch.configure
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -70,14 +69,18 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-prefix=/usr \
-./configure
+CXXFLAGS="$SLKCFLAGS" \
+./configure --prefix=/usr
 make
 make install destdir=$PKG
 
+mv $PKG/usr/share/man $PKG/usr
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYRIGHT INSTALL VERSION changelog $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/usr/share/doc/xca/* $PKG/usr/doc/$PRGNAM-$VERSION
+rm -rf $PKG/usr/share/doc
+cp -a AUTHORS COPYRIGHT INSTALL README.md VERSION changelog \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/misc/xca/xca.info b/misc/xca/xca.info
index 759c1de45e..bce6e33065 100644
--- a/misc/xca/xca.info
+++ b/misc/xca/xca.info
@@ -1,8 +1,8 @@
 PRGNAM="xca"
-VERSION="1.0.0"
+VERSION="1.1.0"
 HOMEPAGE="http://xca.sourceforge.net/"
-DOWNLOAD="http://sourceforge.net/projects/xca/files/xca/1.0.0/xca-1.0.0.tar.gz"
-MD5SUM="e4e8b04047960cf984801e430a1703ab"
+DOWNLOAD="http://sourceforge.net/projects/xca/files/xca/1.1.0/xca-1.1.0.tar.gz"
+MD5SUM="645d3405938c97a3eb0450bbe20234c7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3