- added pkcs15init-help patch (fix for pkcs15-init help)

- moved config and profile files to /etc
- release 2

Changed files:
    opensc.spec -> 1.10

diff --git a/opensc.spec b/opensc.spec
index 4d2d924645b1ee76b358beecb10f6979e93c5c78..8a143b8f0faec7c9d2e7d97d6f4f5903d6022d40 100644 (file)
--- a/opensc.spec
+++ b/opensc.spec
@@ -2,7 +2,7 @@ Summary:        OpenSC library - for accessing SmartCard devices using PC/SC Lite
 Summary(pl):   Biblioteka OpenSC - do korzystania z kart procesorowych przy u¿yciu PC/SC Lite
 Name:          opensc
 Version:       0.7.0
 Summary(pl):   Biblioteka OpenSC - do korzystania z kart procesorowych przy u¿yciu PC/SC Lite
 Name:          opensc
 Version:       0.7.0

-Release:       1
+Release:       2

 License:       LGPL
 Group:         Applications
 Source0:       http://www.opensc.org/files/%{name}-%{version}.tar.gz
 License:       LGPL
 Group:         Applications
 Source0:       http://www.opensc.org/files/%{name}-%{version}.tar.gz


@@ -11,6 +11,7 @@ Patch1:               %{name}-segv.patch
 Patch2:                %{name}-lt.patch
 Patch3:                %{name}-ssl0.9.7.patch
 Patch4:                %{name}-cryptoflex.patch
 Patch2:                %{name}-lt.patch
 Patch3:                %{name}-ssl0.9.7.patch
 Patch4:                %{name}-cryptoflex.patch

+Patch5:                %{name}-pkcs15init-help.patch

 URL:           http://www.opensc.org/
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake
 URL:           http://www.opensc.org/
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake


@@ -23,6 +24,8 @@ BuildRequires:        pcsc-lite-devel
 BuildRequires: readline-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 BuildRequires: readline-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 

+# datadir is used for config files and (editable) profiles
+%define                _datadir        %{_sysconfdir}

 %define                mozplugindir    /usr/lib/mozilla/plugins
 
 %description
 %define                mozplugindir    /usr/lib/mozilla/plugins
 
 %description


@@ -103,6 +106,7 @@ Wtyczka OpenSC Signer dla Mozilli.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1

+%patch5 -p1

 
 %build
 %{__libtoolize}
 
 %build
 %{__libtoolize}


@@ -126,6 +130,9 @@ mv -f $RPM_BUILD_ROOT%{_libdir}/security $RPM_BUILD_ROOT/lib
 # libscam.a is broken (contains libscrandom.a) and not needed (static module)
 rm -f $RPM_BUILD_ROOT%{_libdir}/libscam.{a,la}
 
 # libscam.a is broken (contains libscrandom.a) and not needed (static module)
 rm -f $RPM_BUILD_ROOT%{_libdir}/libscam.{a,la}
 

+mv -f $RPM_BUILD_ROOT%{_datadir}/opensc/opensc.conf{.example,}
+mv -f $RPM_BUILD_ROOT%{_datadir}/opensc/scldap.conf{.example,}
+

 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 


@@ -144,7 +151,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/pkcs11
 %attr(755,root,root) %{_libdir}/pkcs11/opensc-pkcs11.so
 %dir %{_datadir}/opensc
 %dir %{_libdir}/pkcs11
 %attr(755,root,root) %{_libdir}/pkcs11/opensc-pkcs11.so
 %dir %{_datadir}/opensc

-%{_datadir}/opensc/*.profile
+%config(noreplace) %verify(not size mtime md5) %{_datadir}/opensc/*.conf
+%config(noreplace) %verify(not size mtime md5) %{_datadir}/opensc/*.profile

 %{_mandir}/man[157]/pkcs15*
 
 %files devel
 %{_mandir}/man[157]/pkcs15*
 
 %files devel