[packages/opensc] - updated to 0.17.0 - removed outdated pc patch

qboosh qboosh at pld-linux.org
Sun Nov 26 08:33:10 CET 2017 

commit 46bcb391c573e54cb36684f7477c3f2ddc0e9db6
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Nov 26 08:34:12 2017 +0100

    - updated to 0.17.0
    - removed outdated pc patch

 opensc-pc.patch | 20 --------------------
 opensc.spec     | 42 ++++++++++++++++++++++++------------------
 2 files changed, 24 insertions(+), 38 deletions(-)
---
diff --git a/opensc.spec b/opensc.spec
index cc0b729..d377241 100644
--- a/opensc.spec
+++ b/opensc.spec
@@ -1,18 +1,18 @@
 #
 # Conditional build:
-%bcond_with	openct	# use OpenCT instead of PC/SC for reader access
+%bcond_with	openct		# use OpenCT instead of PC/SC for reader access
+%bcond_without	openpace	# OpenPACE support
 #
 Summary:	OpenSC library - for accessing SmartCard devices using PC/SC Lite
 Summary(pl.UTF-8):	Biblioteka OpenSC - do korzystania z kart procesorowych przy użyciu PC/SC Lite
 Name:		opensc
-Version:	0.16.0
-Release:	2
-Epoch:		0
+Version:	0.17.0
+Release:	1
 License:	LGPL v2.1+
 Group:		Applications
-Source0:	http://downloads.sourceforge.net/opensc/%{name}-%{version}.tar.gz
-# Source0-md5:	724d128f23cd7a74b28d04300ce7bcbd
-Patch0:		%{name}-pc.patch
+#Source0Download: https://github.com/OpenSC/OpenSC/releases
+Source0:	https://github.com/OpenSC/OpenSC/releases/download/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	fc502ed7753f950b8e2a18a476d0cd52
 URL:		https://github.com/OpenSC/OpenSC/wiki
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake >= 1:1.10
@@ -21,14 +21,16 @@ BuildRequires:	libltdl-devel
 BuildRequires:	libtool >= 1:1.4.2-9
 BuildRequires:	libxslt-progs
 %{?with_openct:BuildRequires:	openct-devel}
+%{?with_openpace:BuildRequires:	openpace-devel >= 0.9}
 BuildRequires:	openssl-devel >= 0.9.7d
-%{!?with_openct:BuildRequires:	pcsc-lite-devel >= 1.6.0}
+%{!?with_openct:BuildRequires:	pcsc-lite-devel >= 1.8.22}
 BuildRequires:	pkgconfig >= 1:0.9.0
 BuildRequires:	readline-devel
 BuildRequires:	rpmbuild(macros) >= 1.364
 BuildRequires:	zlib-devel
 Requires:	filesystem >= 4.0-28
-%{!?with_openct:Requires:	pcsc-lite-libs >= 1.6.0}
+%{?with_openpace:Requires:	openpace >= 0.9}
+%{!?with_openct:Requires:	pcsc-lite-libs >= 1.8.22}
 Obsoletes:	browser-plugin-opensc
 Obsoletes:	mozilla-plugin-opensc
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -60,11 +62,11 @@ IDentity) produkowanych przez Setec.
 Summary:	OpenSC development files
 Summary(pl.UTF-8):	Pliki dla programistów używających OpenSC
 Group:		Development/Tools
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	libltdl-devel
 %{?with_openct:Requires:	openct-devel}
 Requires:	openssl-devel >= 0.9.7d
-%{!?with_openct:Requires:	pcsc-lite-devel >= 1.6.0}
+%{!?with_openct:Requires:	pcsc-lite-devel >= 1.8.22}
 Requires:	zlib-devel
 
 %description devel
@@ -77,7 +79,7 @@ Pliki dla programistów używających OpenSC.
 Summary:	Static OpenSC library
 Summary(pl.UTF-8):	Bibloteka statyczna OpenSC
 Group:		Development/Tools
-Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
+Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
 Static OpenSC library.
@@ -99,7 +101,6 @@ Bashowe uzupełnianie parametrów poleceń OpenSC.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -110,6 +111,7 @@ Bashowe uzupełnianie parametrów poleceń OpenSC.
 %configure \
 	%{?with_openct:--enable-openct --disable-pcsc} \
 	%{!?with_openct:--enable-pcsc --disable-openct} \
+	%{!?with_openpace:--disable-openpace} \
 	--disable-silent-rules \
 	--enable-doc \
 	--with-pcsc-provider=%{_libdir}/libpcsclite.so.1
@@ -126,7 +128,7 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_libdir}/pkcs11}
 
 # not needed (dlopened by soname)
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/{onepin-opensc-pkcs11,opensc-pkcs11,pkcs11-spy}.la
-# obsoleted by pkg-config
+# API not exported
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/lib{opensc,smm-local}.la
 
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
@@ -147,6 +149,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/gids-tool
 %attr(755,root,root) %{_bindir}/iasecc-tool
 %attr(755,root,root) %{_bindir}/netkey-tool
+%attr(755,root,root) %{_bindir}/npa-tool
 %attr(755,root,root) %{_bindir}/openpgp-tool
 %attr(755,root,root) %{_bindir}/opensc-explorer
 %attr(755,root,root) %{_bindir}/opensc-tool
@@ -158,9 +161,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/sc-hsm-tool
 %attr(755,root,root) %{_bindir}/westcos-tool
 %attr(755,root,root) %{_libdir}/libopensc.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libopensc.so.4
+%attr(755,root,root) %ghost %{_libdir}/libopensc.so.5
 %attr(755,root,root) %{_libdir}/libsmm-local.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libsmm-local.so.4
+%attr(755,root,root) %ghost %{_libdir}/libsmm-local.so.5
 # PKCS11 modules
 %attr(755,root,root) %{_libdir}/onepin-opensc-pkcs11.so
 %attr(755,root,root) %{_libdir}/opensc-pkcs11.so
@@ -171,6 +174,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/opensc
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/opensc.conf
 %config(noreplace) %verify(not md5 mtime size) %{_datadir}/opensc/*.profile
+%if %{with openpace}
+/etc/eac/cvc/DESRCACC100001
+%endif
 %{_mandir}/man1/cardos-tool.1*
 %{_mandir}/man1/cryptoflex-tool.1*
 %{_mandir}/man1/dnie-tool.1*
@@ -178,6 +184,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/gids-tool.1*
 %{_mandir}/man1/iasecc-tool.1*
 %{_mandir}/man1/netkey-tool.1*
+%{_mandir}/man1/npa-tool.1*
 %{_mandir}/man1/openpgp-tool.1*
 %{_mandir}/man1/opensc-explorer.1*
 %{_mandir}/man1/opensc-tool.1*
@@ -194,12 +201,11 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libopensc.so
 %attr(755,root,root) %{_libdir}/libsmm-local.so
-%{_pkgconfigdir}/libopensc.pc
+%{_pkgconfigdir}/opensc-pkcs11.pc
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libopensc.a
-%{_libdir}/libsmm-local.a
 
 %files -n bash-completion-opensc
 %defattr(644,root,root,755)
diff --git a/opensc-pc.patch b/opensc-pc.patch
deleted file mode 100644
index 9a11064..0000000
--- a/opensc-pc.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- opensc-0.13.0/src/libopensc/libopensc.pc.in.orig	2012-12-04 15:43:40.000000000 +0100
-+++ opensc-0.13.0/src/libopensc/libopensc.pc.in	2013-12-30 14:13:18.153385160 +0100
-@@ -6,6 +6,7 @@
- Name: libopensc
- Description: libopensc
- Version: @VERSION@
--Libs: -L${libdir} -lopensc -lscconf
-+Libs: -L${libdir} -lopensc
-+Libs.private: @OPTIONAL_OPENSSL_LIBS@ @OPTIONAL_OPENCT_LIBS@ @OPTIONAL_ZLIB_LIBS@ -ldl
- Cflags: -I${includedir}
- 
---- opensc-0.13.0/src/libopensc/Makefile.am.orig	2012-12-04 15:43:40.000000000 +0100
-+++ opensc-0.13.0/src/libopensc/Makefile.am	2013-12-30 14:18:59.320037508 +0100
-@@ -71,3 +71,6 @@
- mylib_DATA=.libs/@WIN_LIBPREFIX at opensc-@OPENSC_LT_OLDEST at .dll.def
- .libs/@WIN_LIBPREFIX at opensc-@OPENSC_LT_OLDEST at .dll.def:	libopensc.la
- endif
-+
-+pkgconfigdir = $(libdir)/pkgconfig
-+nodist_pkgconfig_DATA = libopensc.pc
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/opensc.git/commitdiff/46bcb391c573e54cb36684f7477c3f2ddc0e9db6

More information about the pld-cvs-commit mailing list