Merge branch 'master' of https://github.com/Fedict/eid-mw

debian/control

@@ -9,7 +9,7 @@ Homepage: http://github.com/Fedict/eid-mw
 Package: eid-mw
 Section: metapackages
 Architecture: any
-Depends: ${misc:Depends}, libbeidpkcs11-0, beid-mozilla-extension
+Depends: ${misc:Depends}, libbeidpkcs11-0, beid-mozilla-extension, pcscd
 Recommends: libccid, libacr38u
 Description: low-level support for Belgian Electronic Identity Card
  This metapackage depends on a PKCS#11 module and a Firefox plugin for
@@ -23,7 +23,7 @@ Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Replaces: eid-mw (<< 4.0.6r1508)
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libbeidpkcs11-bin, pcscd
+Depends: ${shlibs:Depends}, ${misc:Depends}, libbeidpkcs11-bin
 Description: PKCS#11 library for Belgian Electronic Identity Card
  This package contains the PKCS#11 module for the Belgian Electronic
  Identity card, and a few helper libraries. It handles all low-level
@@ -112,7 +112,7 @@ Provides: beidgui
 Replaces: beidgui
 Conflicts: beidgui
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, pcscd
 Description: Graphical interface to Belgian Electronic Identity Card
  This package contains a graphical application to read data from the
  Belgian electronic identity card.

rpm/eid-mw.spec.in

@@ -75,7 +75,6 @@ websites and/or sign documents. This package contains the actual libraries.
 
 %package -n eid-viewer
 Summary: Belgium electronic identity card viewer
-Obsoletes: eid-viewer
 Requires: eid-mw
 %if 0%{?suse_version}
 Requires: pcsc-ccid
@@ -109,6 +108,8 @@ checks the certificate against the government's Trust Service.
 %install
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR="%{buildroot}"
+mkdir -p %{buildroot}%{_libdir}/mozilla/
+mv %{buildroot}/usr/lib/mozilla/pkcs11-modules %{buildroot}%{_libdir}/mozilla/ || true
 rm -f %{buildroot}%{_datadir}/applications/eid-viewer.desktop
 desktop-file-install --dir %{buildroot}%{_datadir}/applications --vendor fedict plugins_tools/eid-viewer/eid-viewer.desktop || true
 
@@ -162,10 +163,7 @@ fi
 %{_datadir}/locale/*/LC_MESSAGES/about-eid-mw.mo
 %{_datadir}/locale/*/LC_MESSAGES/dialogs-beid.mo
 %{_datadir}/p11-kit/
-# The below should really use the _libdir macro, but Firefox won't look
-# in /usr/lib/x86_64-linux-gnu (etc) on Debian; so Makefile.am currently
-# hardcodes the lib directory and doesn't put anything in lib64
-%{_prefix}/lib/mozilla/
+%{_libdir}/mozilla/
 
 %files devel
 %defattr(-, root, root, 0755)