- search for config files in proper place

[packages/opensc.git] / opensc.spec

diff --git a/opensc.spec b/opensc.spec
index 15bc96fd4c42fed7edfcec6efe1e09c873598c9f..41c208ee144a80737a198ccba6396145311fc13c 100644 (file)
--- a/opensc.spec
+++ b/opensc.spec
@@ -2,19 +2,21 @@ 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.8.1
-Release:       1
+Release:       4
+Epoch:         0
 License:       LGPL
 Group:         Applications
 Source0:       http://www.opensc.org/files/%{name}-%{version}.tar.gz
 # Source0-md5: 2b64a8e629bd28a00e707e35fd3eb9c7
 Patch0:                %{name}-libdir.patch
+Patch1:                %{name}-shared-ssl.patch
 URL:           http://www.opensc.org/
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake
 BuildRequires: libassuan-devel >= 1:0.6.0
 BuildRequires: libtool >= 1:1.4.2-9
 BuildRequires: openldap-devel
-BuildRequires: openssl-devel
+BuildRequires: openssl-devel >= 0.9.7d
 BuildRequires: openct-devel
 BuildRequires: pam-devel
 BuildRequires: pcsc-lite-devel
@@ -22,8 +24,9 @@ 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
+%define                _datadir        /etc
+%define                _sysconfdir     /etc/opensc
+%define                mozplugindir    /usr/%{_lib}/mozilla/plugins
 
 %description
 libopensc is a library for accessing SmartCard devices using PC/SC
@@ -48,7 +51,10 @@ IDentity) produkowanych przez Setec.
 Summary:       OpenSC development files
 Summary(pl):   Pliki dla programistów u¿ywaj±cych OpenSC
 Group:         Development/Tools
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+Requires:      openct-devel
+Requires:      openssl-devel
+Requires:      pcsc-lite-devel
 
 %description devel
 OpenSC development files.
@@ -60,7 +66,7 @@ Pliki dla programist
 Summary:       Static OpenSC libraries
 Summary(pl):   Bibloteki statyczne OpenSC
 Group:         Development/Tools
-Requires:      %{name}-devel = %{version}
+Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
 
 %description static
 Static OpenSC libraries.
@@ -68,17 +74,18 @@ Static OpenSC libraries.
 %description static -l pl
 Statyczne biblioteki OpenSC.
 
-%package -n pam_opensc
+%package -n pam-pam_opensc
 Summary:       OpenSC module for PAM
 Summary(pl):   Modu³ PAM OpenSC
 License:       GPL
 Group:         Base
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+Obsoletes:     pam_opensc
 
-%description -n pam_opensc
+%description -n pam-pam_opensc
 OpenSC module for PAM.
 
-%description -n pam_opensc -l pl
+%description -n pam-pam_opensc -l pl
 Modu³ PAM OpenSC.
 
 %package -n mozilla-plugin-opensc
@@ -87,7 +94,7 @@ Summary(pl):  Wtyczka OpenSC Signer dla Mozilli
 # libassuan is GPL
 License:       GPL
 Group:         X11/Applications
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 Requires:      pinentry-gtk
 
 %description -n mozilla-plugin-opensc
@@ -99,11 +106,13 @@ Wtyczka OpenSC Signer dla Mozilli.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
        --with-pin-entry=/usr/bin/pinentry-gtk \
@@ -118,22 +127,22 @@ install -d $RPM_BUILD_ROOT%{mozplugindir}
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT/lib
-mv -f $RPM_BUILD_ROOT%{_libdir}/security $RPM_BUILD_ROOT/lib
+install -d $RPM_BUILD_ROOT/%{_lib}
+mv -f $RPM_BUILD_ROOT%{_libdir}/security $RPM_BUILD_ROOT/%{_lib}
 
 # just install instead of symlinking
 rm -f $RPM_BUILD_ROOT%{mozplugindir}/opensc-signer.so
 mv -f $RPM_BUILD_ROOT%{_libdir}/opensc/opensc-signer.so $RPM_BUILD_ROOT%{mozplugindir}
 
 # default config
-mv -f $RPM_BUILD_ROOT%{_datadir}/opensc/opensc.conf{.example,}
-mv -f $RPM_BUILD_ROOT%{_datadir}/opensc/scldap.conf{.example,}
+mv -f $RPM_BUILD_ROOT%{_sysconfdir}/opensc.conf{.example,}
+mv -f $RPM_BUILD_ROOT%{_sysconfdir}/scldap.conf{.example,}
 
 # useless (dlopened by *.so)
 rm -f $RPM_BUILD_ROOT%{_libdir}/libscam.{a,la} \
        $RPM_BUILD_ROOT%{_libdir}/opensc/*.{a,la} \
        $RPM_BUILD_ROOT%{_libdir}/pkcs11/*.{a,la} \
-       $RPM_BUILD_ROOT/lib/security/pam_opensc.{a,la}
+       $RPM_BUILD_ROOT/%{_lib}/security/pam_opensc.{a,la}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -159,7 +168,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/opensc/engine_opensc.so
 %attr(755,root,root) %{_libdir}/opensc/engine_pkcs11.so
 %dir %{_datadir}/opensc
-%config(noreplace) %verify(not size mtime md5) %{_datadir}/opensc/*.conf
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/*.conf
 %config(noreplace) %verify(not size mtime md5) %{_datadir}/opensc/*.profile
 %{_mandir}/man1/cryptoflex-tool.1*
 %{_mandir}/man1/opensc-explorer.1*
@@ -171,6 +180,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/opensc-config
 %attr(755,root,root) %{_libdir}/libopensc.so
+%attr(755,root,root) %{_libdir}/libpkcs11.so
 %attr(755,root,root) %{_libdir}/libpkcs15init.so
 %attr(755,root,root) %{_libdir}/libscconf.so
 %attr(755,root,root) %{_libdir}/libscldap.so
@@ -184,9 +194,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_libdir}/lib*.a
 
-%files -n pam_opensc
+%files -n pam-pam_opensc
 %defattr(644,root,root,755)
-%attr(755,root,root) /lib/security/pam_opensc.so
+%attr(755,root,root) /%{_lib}/security/pam_opensc.so
 
 %files -n mozilla-plugin-opensc
 %defattr(644,root,root,755)