- search for config files in proper place

[packages/opensc.git] / opensc.spec

diff --git a/opensc.spec b/opensc.spec
index 9b411605d5c8f564a71fb57df3324c7a04e8cb4b..41c208ee144a80737a198ccba6396145311fc13c 100644 (file)
--- a/opensc.spec
+++ b/opensc.spec
@@ -24,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
@@ -111,6 +112,7 @@ Wtyczka OpenSC Signer dla Mozilli.
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
        --with-pin-entry=/usr/bin/pinentry-gtk \
@@ -125,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
@@ -166,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*
@@ -194,7 +196,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %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)