From 8eede4f904b0ad6f2dfe06a6a10ef9f5c27789e0b777c46975a36dbfc069a640 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Fri, 27 Jul 2007 13:42:57 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/opensc?expand=0&rev=3

---
 opensc-0.11.1-sizeof.patch |   2 +
 opensc-0.11.1.tar.bz2      |   3 -
 opensc-0.11.3-rpmlintrc    |   4 ++
 opensc-0.11.3.tar.bz2      |   3 +
 opensc.changes             |  26 +++++++
 opensc.spec                | 135 ++++++++++++++++++++++++-------------
 6 files changed, 125 insertions(+), 48 deletions(-)
 delete mode 100644 opensc-0.11.1.tar.bz2
 create mode 100644 opensc-0.11.3-rpmlintrc
 create mode 100644 opensc-0.11.3.tar.bz2

diff --git a/opensc-0.11.1-sizeof.patch b/opensc-0.11.1-sizeof.patch
index 5055cd8..5b571f2 100644
--- a/opensc-0.11.1-sizeof.patch
+++ b/opensc-0.11.1-sizeof.patch
@@ -1,3 +1,5 @@
+https://www.opensc-project.org/opensc/ticket/153
+================================================================================
 --- src/tools/cryptoflex-tool.c
 +++ src/tools/cryptoflex-tool.c
 @@ -501,7 +501,7 @@
diff --git a/opensc-0.11.1.tar.bz2 b/opensc-0.11.1.tar.bz2
deleted file mode 100644
index 3d35e70..0000000
--- a/opensc-0.11.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:07ba76a02c5e470d41bb062255e9f3ac32d0ad6a571ccdacaa4d0161efe07adf
-size 951680
diff --git a/opensc-0.11.3-rpmlintrc b/opensc-0.11.3-rpmlintrc
new file mode 100644
index 0000000..ff6b87d
--- /dev/null
+++ b/opensc-0.11.3-rpmlintrc
@@ -0,0 +1,4 @@
+addFilter("opensc devel-file-in-non-devel-package")
+addFilter("opensc shlib-policy-devel-file")
+addFilter("opensc shlib-policy-nonversioned-dir")
+addFilter("opensc shlib-policy-missing-suffix")
diff --git a/opensc-0.11.3.tar.bz2 b/opensc-0.11.3.tar.bz2
new file mode 100644
index 0000000..612ff8e
--- /dev/null
+++ b/opensc-0.11.3.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:73ba4fd4a42a05bfac6153f77a2ada8e4ec7221501a4e72c836b5c907e3f7bef
+size 1087847
diff --git a/opensc.changes b/opensc.changes
index 40d7ee5..97d160a 100644
--- a/opensc.changes
+++ b/opensc.changes
@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Thu Jul 26 13:40:30 CEST 2007 - sbrabec@suse.cz
+
+- Updated to version 0.11.3:
+  * make lots of internal functions and variables static.
+  * fix 0 vs NULL in many places. fix ansi c style (void).
+  * avoid variable names used also as glibc function (random etc.).
+  * new code for deleting objects.
+  * special hack for firefox.
+  * suport for Athena APCOS cards added.
+  * piv driver now supports bigger rsa keys too.
+  * enabled pin caching by default.
+  * use max_send_size 255 / max_recv_size 256 bytes by default.
+  * increase pin buffer size to allow longer pin codes.
+  * Added --read-ssk-key option to pkcs15-tool
+  * use pkg-config for finding openct
+  * use strlcpy function
+  * use new pkcs11.h from scute with an open source license
+  * add support for sha2 to pkcs15-crypt
+  * add piv-tool for managing piv cards
+  * add muscle driver
+  * improved oberthur driver
+  * add support for pcsc v2 part10
+  * convert source files to utf-8
+- Split package according to shared library packaging policy.
+
 -------------------------------------------------------------------
 Tue Feb 27 12:12:30 CET 2007 - mvaner@suse.cz
 
diff --git a/opensc.spec b/opensc.spec
index 839ed7e..fd98bfb 100644
--- a/opensc.spec
+++ b/opensc.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package opensc (Version 0.11.1)
+# spec file for package opensc (Version 0.11.3)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -11,25 +11,31 @@
 # norootforbuild
 
 Name:           opensc
-BuildRequires:  openssl-devel pkgconfig readline-devel xorg-x11-devel
+BuildRequires:  openssl-devel pkg-config readline-devel xorg-x11-devel
 %if %suse_version > 1000
-BuildRequires:  libassuan pcsc-lite-devel
+BuildRequires:  pcsc-lite-devel
+%if %suse_version > 1020
+BuildRequires:  libassuan-devel
+%else
+BuildRequires:  libassuan
+%endif
 %endif
 %if %suse_version > 1010
 BuildRequires:  openct-devel
 %endif
 URL:            http://www.opensc-project.org/opensc/
-Version:        0.11.1
-Release:        32
+Version:        0.11.3
+Release:        1
 Group:          Hardware/Other
 Summary:        OpenSC Smart Card Library
-License:        GNU Library General Public License v. 2.0 and 2.1 (LGPL)
-Requires:       pcsc-lite
+License:        LGPL v2 or later
+Requires:       libopensc2 = %{version} pcsc-lite
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source:         opensc-%{version}.tar.bz2
+Source:         %{name}-%{version}.tar.bz2
 Source1:        http://www.opensc.org/files/doc/init_perso_guide.html
-Patch1:         %{name}-%{version}-sizeof.patch
-AutoReqProv:  on
+# Supress all ugly warnings related to required .so and .la files in the main package:
+Source2:        %{name}-%{version}-rpmlintrc
+Patch1:         %{name}-0.11.1-sizeof.patch
 
 %description
 OpenSC provides a set of libraries and utilities to access smart cards.
@@ -42,6 +48,29 @@ aims to be compatible with every software that does so, too.
 
 
 
+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>
+
+%package -n libopensc2
+Group:          System/Libraries
+Summary:        OpenSC Smart Card Library
+Requires:       %{name} >= %{version}
+
+%description -n libopensc2
+OpenSC provides a set of libraries and utilities to access smart cards.
+Its main focus is on cards that support cryptographic operations. It
+facilitates their use in security applications such as mail encryption,
+authentication, and digital signature. OpenSC implements the PKCS#11
+API so applications supporting this API, such as Mozilla Firefox and
+Thunderbird, can use it. OpenSC implements the PKCS#15 standard and
+aims to be compatible with every software that does so, too.
+
+
+
 Authors:
 --------
     Juha Yrj�l� <jyrjola@cc.hut.fi>
@@ -50,7 +79,7 @@ Authors:
     Olaf Kirch <okir@suse.de>
 
 %package devel
-Group:          Development/Libraries/Other
+Group:          Development/Libraries/C and C++
 Summary:        Additional files needed for OpenSC development
 Requires:       %{name} = %{version} glibc-devel openct-devel openssl-devel pcsc-lite-devel
 
@@ -70,60 +99,76 @@ Authors:
 %prep
 %setup -q
 %patch1
+chmod -x doc/svn2cl.xsl
 
 %build
-rm -f aclocal/libtool.m4
-libtoolize --force
-#./bootstrap
-CFLAGS="$RPM_OPT_FLAGS" \
-./configure --prefix=/usr \
-	--sysconfdir=%{_sysconfdir} \
-	--mandir=%{_mandir} \
-	--libdir=%{_libdir}
-make %{?jobs:-j %jobs}
+cp -a /usr/share/gettext/config.rpath .
+autoreconf -f -i
+%configure
+make %{?jobs:-j%jobs}
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+%makeinstall
 # Install opensc.conf
-mkdir -p $RPM_BUILD_ROOT/etc
-install -m 644 etc/opensc.conf $RPM_BUILD_ROOT/etc
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
+install -m 644 etc/opensc.conf $RPM_BUILD_ROOT%{_sysconfdir}
 # Copy init_perso.html to docs so it's installed
 cp %{SOURCE1} .
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-%run_ldconfig
+%post -n libopensc2 -p /sbin/ldconfig
 
-%postun
-%run_ldconfig
+%postun -n libopensc2 -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
-%doc COPYING NEWS README doc init_perso_guide.html
-%config /etc/opensc.conf
-/usr/bin/*-crypt
-/usr/bin/*-explorer
-/usr/bin/*-info
-/usr/bin/*-init
-/usr/bin/*-tool
-/usr/bin/eidenv
-%_libdir/*.so.*
-# Note: Required by ltdl:
-%_libdir/*.la
-%_libdir/*.so
-/usr/share/opensc
-%_mandir/man?/*
+%doc COPYING NEWS README doc/*.css doc/*.gif doc/*.html doc/ChangeLog init_perso_guide.html
+%{_bindir}/*
+%exclude %{_bindir}/*-config
+%{_datadir}/opensc
+# Note: .la and .so must be in the main package, required by ltdl:
+%{_libdir}/*.la
+%{_libdir}/*.so
+%doc %{_mandir}/man?/*.*
+%config %{_sysconfdir}/opensc.conf
+
+%files -n libopensc2
+%defattr(-,root,root)
+%{_libdir}/*.so.*
 
 %files devel
 %defattr(-,root,root)
-/usr/bin/*-config
-/usr/include/opensc
-%_libdir/*.a
-%_libdir/pkgconfig/*.pc
+%{_bindir}/*-config
+%{_includedir}/opensc
+%{_libdir}/*.a
+%{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu Jul 26 2007 - sbrabec@suse.cz
+- Updated to version 0.11.3:
+  * make lots of internal functions and variables static.
+  * fix 0 vs NULL in many places. fix ansi c style (void).
+  * avoid variable names used also as glibc function (random etc.).
+  * new code for deleting objects.
+  * special hack for firefox.
+  * suport for Athena APCOS cards added.
+  * piv driver now supports bigger rsa keys too.
+  * enabled pin caching by default.
+  * use max_send_size 255 / max_recv_size 256 bytes by default.
+  * increase pin buffer size to allow longer pin codes.
+  * Added --read-ssk-key option to pkcs15-tool
+  * use pkg-config for finding openct
+  * use strlcpy function
+  * use new pkcs11.h from scute with an open source license
+  * add support for sha2 to pkcs15-crypt
+  * add piv-tool for managing piv cards
+  * add muscle driver
+  * improved oberthur driver
+  * add support for pcsc v2 part10
+  * convert source files to utf-8
+- Split package according to shared library packaging policy.
 * Tue Feb 27 2007 - mvaner@suse.cz
 - Fixing dodgy use of sizeof (#238660)
   - sizeof.patch