+# TODO
+# Aug 14 13:19:00 haarber gnome-keyring-daemon[6524]: couldn't list keyrings at: /etc/certs: Error opening directory '/etc/certs': Permission denied
+#
+# Conditional build:
+%bcond_with p11_tests # PKCS#11 tests
+#
Summary: Keep passwords and other user's secrets
Summary(pl.UTF-8): Przechowywanie haseł i innych tajnych danych użytkowników
Name: gnome-keyring
-Version: 2.28.2
+Version: 3.34.0
Release: 1
License: LGPL v2+ (library), GPL v2+ (programs)
Group: X11/Applications
-Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-keyring/2.28/%{name}-%{version}.tar.bz2
-# Source0-md5: 97ea6823e88b39284187764c1ca95a59
+Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-keyring/3.34/%{name}-%{version}.tar.xz
+# Source0-md5: 7c8fd85e46ed4ba1add0288b2ead9aec
URL: http://live.gnome.org/GnomeKeyring
-BuildRequires: GConf2-devel >= 2.24.0
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: dbus-devel >= 1.2.0
+BuildRequires: autoconf >= 2.50
+BuildRequires: automake >= 1:1.12
BuildRequires: docbook-dtd412-xml
-BuildRequires: gettext-devel
-BuildRequires: gtk+2-devel >= 2:2.14.0
-BuildRequires: gtk-doc >= 1.9
-BuildRequires: hal-devel >= 0.5.10
-BuildRequires: intltool >= 0.40.0
+BuildRequires: gcr-devel >= 3.28.0
+BuildRequires: gettext-tools >= 0.19.8
+BuildRequires: glib2-devel >= 1:2.44.0
+BuildRequires: libcap-ng-devel
BuildRequires: libgcrypt-devel >= 1.2.2
+BuildRequires: libselinux-devel
+# for some test only
BuildRequires: libtasn1-devel >= 0.3.4
BuildRequires: libtool
+BuildRequires: p11-kit-devel >= 0.16
+%{?with_p11_tests:BuildRequires: p11-tests-devel >= 0.1}
BuildRequires: pam-devel
BuildRequires: pkgconfig
-BuildRequires: rpmbuild(macros) >= 1.197
-BuildRequires: sed >= 4.0
-Requires(post,preun): GConf2
-Requires: dbus >= 1.2.0
+BuildRequires: rpmbuild(macros) >= 1.592
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
+Requires(post,postun): glib2 >= 1:2.38.0
+Requires: filesystem >= 4.0-28
+Requires: gcr >= 3.28.0
+Requires: glib2 >= 1:2.44.0
+Requires: hicolor-icon-theme
+Requires: p11-kit >= 0.16
+Conflicts: rpm < 4.4.2-0.2
# sr@Latn vs. sr@latin
Conflicts: glibc-misc < 6:2.7
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
users. It is run as a daemon in the session, similar to ssh-agent, and
other applications can locate it by an environment variable.
-The library libgnome-keyring is used by applications to integrate with
-the GNOME keyring system.
-
%description -l pl.UTF-8
GNOME Keyring to program do przechowywania haseł i innych tajnych
danych użytkowników. Działa jako demon w sesji, podobnie do
ssh-agenta, a inne aplikacje mogą znaleźć go poprzez zmienną
środowiskową.
-Biblioteka libgnome-keyring jest używana przez aplikacje do integracji
-z systemem kluczy GNOME.
-
-%package libs
-Summary: GNOME keyring library
-Summary(pl.UTF-8): Biblioteka GNOME keyring
-License: LGPL v2+
-Group: X11/Libraries
-
-%description libs
-GNOME keyring library.
-
-%description libs -l pl.UTF-8
-Biblioteka GNOME keyring.
-
-%package devel
-Summary: Headers for GNOME keyring library
-Summary(pl.UTF-8): Pliki nagłówkowe biblioteki GNOME keyring
-License: LGPL v2+
-Group: X11/Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
-Requires: dbus-devel >= 1.2.0
-Requires: gtk+2-devel >= 2:2.14.0
-Requires: libtasn1-devel >= 0.3.4
-
-%description devel
-Headers for GNOME keyring library.
-
-%description devel -l pl.UTF-8
-Pliki nagłówkowe biblioteki GNOME keyring.
-
-%package static
-Summary: Static GNOME keyring libraries
-Summary(pl.UTF-8): Statyczne biblioteki GNOME keyring
-License: LGPL v2+
-Group: X11/Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
-
-%description static
-Static versions of GNOME keyring libraries.
-
-%description static -l pl.UTF-8
-Statyczne biblioteki GNOME keyring.
-
-%package apidocs
-Summary: GNOME keyring API documentation
-Summary(pl.UTF-8): Dokumentacja API GNOME keyring
-License: LGPL v2+
-Group: Documentation
-Requires: gtk-doc-common
-
-%description apidocs
-GNOME keyring API documentation.
-
-%description apidocs -l pl.UTF-8
-Dokumentacja API GNOME keyring.
-
-%package pam
+%package -n pam-pam_gnome_keyring
Summary: A PAM module for unlocking keyrings at login time
Summary(pl.UTF-8): Moduł PAM do odblokowywania zbiorów kluczy w czasie logowania
License: LGPL v2+
Group: Libraries
Requires: %{name} = %{version}-%{release}
+Obsoletes: gnome-keyring-pam
-%description pam
+%description -n pam-pam_gnome_keyring
A PAM module that can automatically unlock the "login" keyring when
the user logs in and start the keyring daemon.
-%description pam -l pl.UTF-8
+%description -n pam-pam_gnome_keyring -l pl.UTF-8
Moduł PAM, który może automatycznie odblokowywać zbiór kluczy "login"
w czasie logowania użytkownika i uruchamiania demona keyring.
%prep
%setup -q
-rm -f po/en@shaw.po
-sed -i -e 's/en@shaw//' po/LINGUAS
-
%build
-%{__gtkdocize}
-%{__glib_gettextize}
-%{__intltoolize}
%{__libtoolize}
%{__aclocal}
%{__autoconf}
%{__autoheader}
%{__automake}
%configure \
- --disable-schemas-install \
- --enable-gtk-doc \
- --enable-static \
- --with-html-dir=%{_gtkdocdir} \
+ SSH_ADD="/usr/bin/ssh-add" \
+ SSH_AGENT="/usr/bin/ssh-agent" \
+ --disable-silent-rules \
+ %{!?with_p11_tests:--disable-p11-tests} \
--with-pam-dir=/%{_lib}/security
%{__make}
%{__make} install install-pam \
DESTDIR=$RPM_BUILD_ROOT
-%{__rm} $RPM_BUILD_ROOT/%{_lib}/security/pam_gnome_keyring.{l,}a
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/gnome-keyring/gnome-keyring-pkcs11.{l,}a
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/gnome-keyring/{devel,standalone}/*.{la,a}
+%{__rm} $RPM_BUILD_ROOT/%{_lib}/security/pam_gnome_keyring.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/pkcs11/gnome-keyring-pkcs11.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/gnome-keyring/devel/*.la
%find_lang %{name}
rm -rf $RPM_BUILD_ROOT
%post
-%gconf_schema_install gnome-keyring.schemas
-
-%preun
-%gconf_schema_uninstall gnome-keyring.schemas
+%glib_compile_schemas
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
+%postun
+%glib_compile_schemas
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README TODO
+%doc AUTHORS ChangeLog NEWS README
%attr(755,root,root) %{_bindir}/gnome-keyring
+%attr(755,root,root) %{_bindir}/gnome-keyring-3
%attr(755,root,root) %{_bindir}/gnome-keyring-daemon
+%attr(755,root,root) %{_libdir}/pkcs11/gnome-keyring-pkcs11.so
%dir %{_libdir}/%{name}
-%attr(755,root,root) %{_libexecdir}/%{name}-ask
-%attr(755,root,root) %{_libdir}/%{name}/gnome-keyring-pkcs11.so
%dir %{_libdir}/%{name}/devel
-%attr(755,root,root) %{_libdir}/%{name}/devel/gck-ssh-store-standalone.so
-%attr(755,root,root) %{_libdir}/%{name}/devel/gck-user-store-standalone.so
-%dir %{_libdir}/%{name}/standalone
-%attr(755,root,root) %{_libdir}/%{name}/standalone/gck-roots-store-standalone.so
-%{_sysconfdir}/gconf/schemas/gnome-keyring.schemas
-%{_sysconfdir}/xdg/autostart/gnome-keyring-daemon.desktop
+%attr(755,root,root) %{_libdir}/%{name}/devel/gkm-gnome2-store-standalone.so
+%attr(755,root,root) %{_libdir}/%{name}/devel/gkm-secret-store-standalone.so
+%attr(755,root,root) %{_libdir}/%{name}/devel/gkm-ssh-store-standalone.so
+%attr(755,root,root) %{_libdir}/%{name}/devel/gkm-xdg-store-standalone.so
+%{_sysconfdir}/xdg/autostart/gnome-keyring-pkcs11.desktop
+%{_sysconfdir}/xdg/autostart/gnome-keyring-secrets.desktop
+%{_sysconfdir}/xdg/autostart/gnome-keyring-ssh.desktop
+%{_datadir}/GConf/gsettings/org.gnome.crypto.cache.convert
+%{_datadir}/dbus-1/services/org.freedesktop.secrets.service
%{_datadir}/dbus-1/services/org.gnome.keyring.service
-%{_datadir}/gcr
-
-%files libs
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgcr.so.*.*.*
-%attr(755,root,root) %{_libdir}/libgnome-keyring.so.*.*.*
-%attr(755,root,root) %{_libdir}/libgp11.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgcr.so.0
-%attr(755,root,root) %ghost %{_libdir}/libgnome-keyring.so.0
-%attr(755,root,root) %ghost %{_libdir}/libgp11.so.0
-
-%files devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgcr.so
-%attr(755,root,root) %{_libdir}/libgnome-keyring.so
-%attr(755,root,root) %{_libdir}/libgp11.so
-%{_libdir}/libgcr.la
-%{_libdir}/libgnome-keyring.la
-%{_libdir}/libgp11.la
-%{_includedir}/gcr
-%{_includedir}/gnome-keyring-1
-%{_includedir}/gp11
-%{_pkgconfigdir}/gcr-0.pc
-%{_pkgconfigdir}/gnome-keyring-1.pc
-%{_pkgconfigdir}/gp11-0.pc
-
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libgcr.a
-%{_libdir}/libgnome-keyring.a
-%{_libdir}/libgp11.a
-
-%files apidocs
-%defattr(644,root,root,755)
-%{_gtkdocdir}/gcr
-%{_gtkdocdir}/%{name}
-%{_gtkdocdir}/gp11
+%{_datadir}/glib-2.0/schemas/org.gnome.crypto.cache.gschema.xml
+%{_mandir}/man1/gnome-keyring.1*
+%{_mandir}/man1/gnome-keyring-3.1*
+%{_mandir}/man1/gnome-keyring-daemon.1*
+%{_datadir}/p11-kit/modules/gnome-keyring.module
-%files pam
+%files -n pam-pam_gnome_keyring
%defattr(644,root,root,755)
%attr(755,root,root) /%{_lib}/security/pam_gnome_keyring.so