From ba7af549cb2b856da893c75b73fd83ee0ca8036369f5f729c37a3b1a9d75df3f Mon Sep 17 00:00:00 2001
From: Stanislav Brabec <sbrabec@suse.com>
Date: Fri, 7 Aug 2015 16:14:19 +0000
Subject: [PATCH] Accepting request 319752 from
 home:bhwachter:branches:security:chipcard

Update to version 0.15.0

OBS-URL: https://build.opensuse.org/request/show/319752
OBS-URL: https://build.opensuse.org/package/show/security:chipcard/opensc?expand=0&rev=35
---
 completion-template  | 45 ++++++++++++++++++++++++++++++++++++++++++++
 opensc-0.14.0.tar.gz |  3 ---
 opensc-0.15.0.tar.gz |  3 +++
 opensc-rpmlintrc     |  1 +
 opensc.changes       |  7 +++++++
 opensc.module        |  8 ++++++++
 opensc.spec          | 15 +++++++++++++--
 7 files changed, 77 insertions(+), 5 deletions(-)
 create mode 100644 completion-template
 delete mode 100644 opensc-0.14.0.tar.gz
 create mode 100644 opensc-0.15.0.tar.gz
 create mode 100644 opensc.module

diff --git a/completion-template b/completion-template
new file mode 100644
index 0000000..43b9bd5
--- /dev/null
+++ b/completion-template
@@ -0,0 +1,45 @@
+# this was auto-generated by OpenSC/doc/tools/Makefile.am
+_FUNCTION_NAME()
+{
+    COMPREPLY=()
+    local cur prev split=false
+    _get_comp_words_by_ref cur prev
+
+    _split_longopt && split=true
+
+    opts="ALLOPTS"
+
+    if [ ${COMP_CWORD} -eq 1 ]; then
+        COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+        return 0
+    fi
+
+    case "${prev}" in
+        OPTSWITHARGS)
+            return 0
+            ;;
+        *)
+            COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
+            return 0
+            ;;
+    esac
+
+    $split && return 0
+
+    if [[ "$cur" == -* ]]; then
+        _longopt $1
+        return
+    fi
+
+    _filedir
+}
+complete -F _FUNCTION_NAME PROGRAM_NAME
+
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 4
+# sh-indent-comment: t
+# indent-tabs-mode: nil
+# End:
+# ex: ts=4 sw=4 et filetype=sh
diff --git a/opensc-0.14.0.tar.gz b/opensc-0.14.0.tar.gz
deleted file mode 100644
index 6ea9f7c..0000000
--- a/opensc-0.14.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:facdca215f74d999b286ae246ada8d8fcb97ce58f0a6dd30d8b1c180101e9bf0
-size 2039158
diff --git a/opensc-0.15.0.tar.gz b/opensc-0.15.0.tar.gz
new file mode 100644
index 0000000..5f3f242
--- /dev/null
+++ b/opensc-0.15.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:399b2107a69e3f67e4e76dc2dbd951dbced8e534b1e0f919e176aea9b85970d7
+size 2153075
diff --git a/opensc-rpmlintrc b/opensc-rpmlintrc
index a2b652f..a8441c2 100644
--- a/opensc-rpmlintrc
+++ b/opensc-rpmlintrc
@@ -2,3 +2,4 @@
 addFilter("shlib-policy-missing-suffix")
 # There is no devel package any more.
 addFilter("obsolete-not-provided")
+addFilter("devel-file-in-non-devel-package")
diff --git a/opensc.changes b/opensc.changes
index 5c80d45..62c6e58 100644
--- a/opensc.changes
+++ b/opensc.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jul 30 16:16:19 EEST 2015 - bwachter-pkg@lart.info
+
+- update to version 0.15.0
+- register with p11-kit 
+  (https://www.opensc-project.org/opensc/ticket/390)
+
 -------------------------------------------------------------------
 Mon Feb 16 15:14:55 UTC 2015 - michael@stroeder.com
 
diff --git a/opensc.module b/opensc.module
new file mode 100644
index 0000000..c063a43
--- /dev/null
+++ b/opensc.module
@@ -0,0 +1,8 @@
+# This file describes how to load the opensc module
+# See: http://p11-glue.freedesktop.org/doc/p11-kit/config.html
+
+# This is a relative path, which means it will be loaded from
+# the p11-kit default path which is usually $(libdir)/pkcs11.
+# Doing it this way allows for packagers to package opensc for
+# 32-bit and 64-bit and make them parallel installable
+module: onepin-opensc-pkcs11.so
diff --git a/opensc.spec b/opensc.spec
index 4bdafa4..2becf14 100644
--- a/opensc.spec
+++ b/opensc.spec
@@ -25,14 +25,20 @@ BuildRequires:  pcsc-lite-devel
 BuildRequires:  pkg-config
 BuildRequires:  readline-devel
 Url:            https://github.com/OpenSC/OpenSC/wiki
-Version:        0.14.0
+Version:        0.15.0
 Release:        0
 Summary:        Smart Card Utilities
 License:        LGPL-2.1+
-Group:          Productivity/Security   
+Group:          Productivity/Security
 Source:         %{name}-%{version}.tar.gz
 Source1:        %{name}-ADVISORIES
 Source2:        %{name}-rpmlintrc
+# This is in git, but got stripped from the release tarball
+# https://github.com/OpenSC/OpenSC/issues/505
+Source3:        completion-template
+# Register with p11-kit
+# https://www.opensc-project.org/opensc/ticket/390
+Source4:        opensc.module
 Requires:       pcsc-lite
 # There is no more devel package.
 Obsoletes:      opensc-devel < %{version}
@@ -70,6 +76,7 @@ cp -a %{S:1} ADVISORIES
 %if %suse_version > 1100
 autoreconf -f -i
 %endif
+cp %{SOURCE3} doc/tools/completion-template
 %configure\
 	--docdir=%{_docdir}/%{name}\
 	--disable-static\
@@ -83,6 +90,7 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkcs11
 cp COPYING ADVISORIES ChangeLog README $RPM_BUILD_ROOT%{_docdir}/%{name}
 # Private library.
 rm $RPM_BUILD_ROOT%{_libdir}/libopensc.so
+install -D -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/pkcs11/modules/opensc.module
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -109,6 +117,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkcs11/*.so
 %doc %{_mandir}/man?/*.*
 %config %{_sysconfdir}/opensc.conf
+%dir %{_sysconfdir}/pkcs11
+%config %{_sysconfdir}/pkcs11/modules/
+%{_sysconfdir}/bash_completion.d/*
 # This is a private library. There is no reason to split it to libopensc* package.
 %{_libdir}/libopensc.so.*