-Summary: .
+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: 0.1
-Release: 1
-License: LGPL v2+/GPL v2+
-Group: Libraries
-Source0: http://ftp.gnome.org/pub/gnome/sources/%{name}/0.1/%{name}-%{version}.tar.bz2
-# Source0-md5: 82dda41896256f7f687ab6d8b296a3c0
-URL: http://www.gnome.org/
-BuildRequires: gtk+2-devel >= 2.3.1
-BuildRequires: glib2-devel >= 2.3.1
+Version: 2.30.1
+Release: 3
+License: LGPL v2+ (library), GPL v2+ (programs)
+Group: X11/Applications
+Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-keyring/2.30/%{name}-%{version}.tar.bz2
+# Source0-md5: 41f4d9323c4ad7c58d88348979f7daba
+Patch0: %{name}-fix_service_file_creation.patch
+Patch1: %{name}-use_org.freedesktop.secrets.patch
+URL: http://live.gnome.org/GnomeKeyring
+BuildRequires: GConf2-devel >= 2.24.0
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: dbus-devel >= 1.2.0
+BuildRequires: docbook-dtd412-xml
+BuildRequires: gettext-devel
+BuildRequires: gtk+2-devel >= 2:2.18.0
+BuildRequires: gtk-doc >= 1.9
+BuildRequires: intltool >= 0.40.0
+BuildRequires: libgcrypt-devel >= 1.2.2
+BuildRequires: libtasn1-devel >= 0.3.4
+BuildRequires: libtool
+BuildRequires: pam-devel
+BuildRequires: pkgconfig
+BuildRequires: rpmbuild(macros) >= 1.197
+BuildRequires: sed >= 4.0
+Requires(post,preun): GConf2
+Requires: dbus >= 1.2.0
+# sr@Latn vs. sr@latin
+Conflicts: glibc-misc < 6:2.7
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%define _libexecdir %{_libdir}/%{name}
+
%description
-gnome-keyring is a program that keep password and other secrets for
-users. It is run as a damon in the session, similar to ssh-agent, and
+GNOME Keyring is a program that keeps password and other secrets for
+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.
+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
-Summary(pl): Pliki nag³ówkowe gnome-keyring
+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} = %{version}
-Requires: gtk+2-devel >= 2.3.1
-Requires: glib2-devel >= 2.3.1
+Requires: %{name}-libs = %{version}-%{release}
+Requires: dbus-devel >= 1.2.0
+Requires: gtk+2-devel >= 2:2.18.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): Statyczne biblioteki gnome-keyring
+Summary: Static GNOME keyring libraries
+Summary(pl.UTF-8): Statyczne biblioteki GNOME keyring
+License: LGPL v2+
Group: X11/Development/Libraries
-Requires: %{name}-devel = %{version}
+Requires: %{name}-devel = %{version}-%{release}
%description static
-Static version of gnome-keyring libraries.
+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 -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 -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 -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
+%patch0 -p1
+%patch1 -p1
+
+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 \
- --enable-static
-
+ --disable-schemas-install \
+ --enable-gtk-doc \
+ --enable-static \
+ --with-html-dir=%{_gtkdocdir} \
+ --with-pam-dir=/%{_lib}/security
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_datadir}/gnome/help
-%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT \
- pkgconfigdir=%{_pkgconfigdir}
+%{__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}
-%find_lang %{name} --with-gnome --all-name
+%find_lang %{name}
%clean
rm -rf $RPM_BUILD_ROOT
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post
+%gconf_schema_install gnome-keyring.schemas
+
+%preun
+%gconf_schema_uninstall gnome-keyring.schemas
+
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
%files -f %{name}.lang
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%attr(755,root,root) %{_bindir}/gnome-keyring
+%attr(755,root,root) %{_bindir}/gnome-keyring-daemon
+%dir %{_libdir}/%{name}
+%attr(755,root,root) %{_libexecdir}/gnome-keyring-prompt
+%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
+%attr(755,root,root) %{_libdir}/%{name}/standalone/gck-secret-store-standalone.so
+%{_sysconfdir}/gconf/schemas/gnome-keyring.schemas
+%{_sysconfdir}/xdg/autostart/gnome-keyring-pkcs11.desktop
+%{_sysconfdir}/xdg/autostart/gnome-keyring-secrets.desktop
+%{_sysconfdir}/xdg/autostart/gnome-keyring-ssh.desktop
+%{_datadir}/dbus-1/services/org.freedesktop.secrets.service
+%{_datadir}/dbus-1/services/org.gnome.keyring.service
+%{_datadir}/gcr
+%{_datadir}/gnome-keyring
+
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libgcr.so.*.*.*
+%attr(755,root,root) %{_libdir}/libgp11.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgcr.so.0
+%attr(755,root,root) %ghost %{_libdir}/libgp11.so.0
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
-%{_pkgconfigdir}/*.pc
-%{_includedir}/*
+%attr(755,root,root) %{_libdir}/libgcr.so
+%attr(755,root,root) %{_libdir}/libgp11.so
+%{_libdir}/libgcr.la
+%{_libdir}/libgp11.la
+%{_includedir}/gcr
+%{_includedir}/gp11
+%{_pkgconfigdir}/gcr-0.pc
+%{_pkgconfigdir}/gp11-0.pc
%files static
%defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libgcr.a
+%{_libdir}/libgp11.a
+
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/gcr
+%{_gtkdocdir}/gp11
+
+%files -n pam-pam_gnome_keyring
+%defattr(644,root,root,755)
+%attr(755,root,root) /%{_lib}/security/pam_gnome_keyring.so