Accepting request 406753 from home:Simmphonie

OBS-URL: https://build.opensuse.org/request/show/406753 OBS-URL: https://build.opensuse.org/package/show/security:chipcard/opensc?expand=0&rev=39
2016-08-23 07:26:09 +00:00 · 2016-08-23 07:26:09 +00:00 · b92a6868c4
commit b92a6868c4
parent bb23158ac9
5 changed files with 33 additions and 89 deletions
--- a/45
+++ b/45
@ -1,45 +0,0 @@
-# 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
--- a/opensc-0.15.0.tar.gz
+++ b/opensc-0.15.0.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:399b2107a69e3f67e4e76dc2dbd951dbced8e534b1e0f919e176aea9b85970d7
-size 2153075
--- a/opensc-0.16.0.tar.gz
+++ b/opensc-0.16.0.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3ac8c29542bb48179e7086d35a1b8907a4e86aca3de3323c2f48bd74eaaf5729
+size 1760418
--- a/opensc.changes
+++ b/opensc.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jul  5 12:09:24 UTC 2016 - t.gruner@katodev.de
+
+- update to version 0.16.0
+- remove fix (issue 505)
+- clean up spec-file
+
 -------------------------------------------------------------------
 Thu Jul 30 16:16:19 EEST 2015 - bwachter-pkg@lart.info

--- a/opensc.spec
+++ b/opensc.spec
@ -1,7 +1,7 @@
 #
 # spec file for package opensc
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -17,6 +17,18 @@


 Name:           opensc
+Version:        0.16.0
+Release:        0
+Summary:        Smart Card Utilities
+License:        LGPL-2.1+
+Group:          Productivity/Security
+Url:            https://github.com/OpenSC/OpenSC/wiki
+Source:         %{name}-%{version}.tar.gz
+Source1:        %{name}-ADVISORIES
+Source2:        %{name}-rpmlintrc
+# Register with p11-kit
+# https://www.opensc-project.org/opensc/ticket/390
+Source3:        opensc.module
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  libtool
 BuildRequires:  libxslt
@ -24,26 +36,9 @@ BuildRequires:  openssl-devel
 BuildRequires:  pcsc-lite-devel
 BuildRequires:  pkg-config
 BuildRequires:  readline-devel
-Url:            https://github.com/OpenSC/OpenSC/wiki
-Version:        0.15.0
-Release:        0
-Summary:        Smart Card Utilities
-License:        LGPL-2.1+
-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}
-# This package is not supported any more. Last appeared in openSUSE 11.3, never appeared in SLE:
-Obsoletes:      opensc-java <= 0.2.2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

 %description
@ -61,49 +56,36 @@ also card version, card OS version and preloaded applet. Only subset of
 possible operations may be supported for your card. Card initialization
 may require third party proprietary software.

-Authors:
--------
-    Juha Yrjölä <jyrjola@cc.hut.fi>
-    Antti Tapaninen <aet@cc.hut.fi>
-    Timo Teräs <timo.teras@iki.fi>
-    Olaf Kirch <okir@suse.de>
-
 %prep
 %setup -q
-cp -a %{S:1} ADVISORIES
+cp -a %{SOURCE1} ADVISORIES

 %build
-%if %suse_version > 1100
+%if 0%{?suse_version} > 1100
 autoreconf -f -i
 %endif
-cp %{SOURCE3} doc/tools/completion-template
 %configure\
 	--docdir=%{_docdir}/%{name}\
 	--disable-static\
 	--enable-doc
-make %{?jobs:-j%jobs}
+make %{?_smp_mflags}

 %install
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkcs11
-%makeinstall
-cp COPYING ADVISORIES ChangeLog README $RPM_BUILD_ROOT%{_docdir}/%{name}
+mkdir -p %{buildroot}%{_sysconfdir}
+mkdir -p %{buildroot}%{_libdir}/pkcs11
+make %{?_smp_mflags} DESTDIR=%{buildroot} install
+cp COPYING ADVISORIES NEWS README %{buildroot}%{_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
+rm %{buildroot}%{_libdir}/libopensc.so
+install -D -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/pkcs11/modules/opensc.module

 %post -p /sbin/ldconfig
-
 %postun -p /sbin/ldconfig

 %files
 %defattr(-,root,root)
 %doc %dir %{_docdir}/%{name}
 %doc %{_docdir}/%{name}/ADVISORIES
-%doc %{_docdir}/%{name}/ChangeLog
 %doc %{_docdir}/%{name}/COPYING
 %doc %{_docdir}/%{name}/NEWS
 %doc %{_docdir}/%{name}/README
@ -115,7 +97,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so*
 %dir %{_libdir}/pkcs11
 %{_libdir}/pkcs11/*.so
-%doc %{_mandir}/man?/*.*
+%{_mandir}/man?/*.*
 %config %{_sysconfdir}/opensc.conf
 %dir %{_sysconfdir}/pkcs11
 %config %{_sysconfdir}/pkcs11/modules/