X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gnome-keyring.spec;h=c5a2e2b32d652921bf23bb2dcc99cd3d0e58ad87;hb=f1b55e713c12d60b52063e5c4888b512fa87de88;hp=6e40f6028f91627f8cc8cbdee2bd1127879d4168;hpb=5ff0a6cbe83088a32026547a25e969836412548c;p=packages%2Fgnome-keyring.git

diff --git a/gnome-keyring.spec b/gnome-keyring.spec
index 6e40f60..c5a2e2b 100644
--- a/gnome-keyring.spec
+++ b/gnome-keyring.spec
@@ -1,121 +1,231 @@
 Summary:	Keep passwords and other user's secrets
-Summary(pl):	Przechowywanie hase³ i innych tajnych danych u¿ytkowników
+Summary(pl.UTF-8):	Przechowywanie haseł i innych tajnych danych użytkowników
 Name:		gnome-keyring
-Version:	0.4.6
+Version:	3.0.1
 Release:	1
-License:	LGPL v2+/GPL v2+
+License:	LGPL v2+ (library), GPL v2+ (programs)
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/gnome/sources/gnome-keyring/0.4/%{name}-%{version}.tar.bz2
-# Source0-md5:	7d94fc9598035ea1a92f4e777dfc4194
-URL:		http://www.gnome.org/
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-keyring/3.0/%{name}-%{version}.tar.bz2
+# Source0-md5:	9d65defd527919107c72e298f6660473
+URL:		http://live.gnome.org/GnomeKeyring
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	glib2-devel >= 1:2.6.3
-BuildRequires:	gtk+2-devel >= 2:2.6.3
+BuildRequires:	cairo-devel
+BuildRequires:	dbus-devel >= 1.2.0
+BuildRequires:	docbook-dtd412-xml
+BuildRequires:	gettext-devel
+BuildRequires:	glib2-devel >= 1:2.26.0
+BuildRequires:	gtk+3-devel >= 3.0.0
+BuildRequires:	gtk-doc >= 1.9
+BuildRequires:	intltool >= 0.40.0
+BuildRequires:	libcap-devel
+BuildRequires:	libgcrypt-devel >= 1.2.2
+BuildRequires:	libtasn1-devel >= 0.3.4
 BuildRequires:	libtool
-BuildRequires:	rpmbuild(macros) >= 1.197
+BuildRequires:	pam-devel
+BuildRequires:	pkgconfig
+BuildRequires:	rpmbuild(macros) >= 1.592
+Requires(post,postun):	glib2 >= 1:2.26.0
+Requires:	dbus >= 1.2.0
+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)
 
+%define		_libexecdir	%{_libdir}/%{name}
+
 %description
 GNOME Keyring is a program that keeps password and other secrets for
-users. It is run as a deamon in the session, similar to ssh-agent, and
+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
-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±.
+%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
+Biblioteka libgnome-keyring jest używana przez aplikacje do integracji
 z systemem kluczy GNOME.
 
 %package libs
 Summary:	GNOME keyring library
-Summary(pl):	Biblioteka GNOME keyring
-Group:		Libraries
+Summary(pl.UTF-8):	Biblioteka GNOME keyring
+License:	LGPL v2+
+Group:		X11/Libraries
 
 %description libs
 GNOME keyring library.
 
-%description libs -l pl
+%description libs -l pl.UTF-8
 Biblioteka GNOME keyring.
 
 %package devel
 Summary:	Headers for GNOME keyring library
-Summary(pl):	Pliki nag³ówkowe biblioteki GNOME keyring
-Group:		Development/Libraries
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki GNOME keyring
+License:	LGPL v2+
+Group:		X11/Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	glib2-devel >= 1:2.6.3
+Requires:	dbus-devel >= 1.2.0
+Requires:	glib2-devel >= 1:2.26.0
+Requires:	gtk+3-devel >= 3.0.0
+Requires:	libtasn1-devel >= 0.3.4
 
 %description devel
 Headers for GNOME keyring library.
 
-%description devel -l pl
-Pliki nag³ówkowe biblioteki GNOME keyring.
+%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
-Group:		Development/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
+%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
 
 %build
+%{__gtkdocize}
+%{__glib_gettextize}
+%{__intltoolize}
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
-	--enable-static 
-
+	--disable-silent-rules \
+	--disable-tests \
+	--enable-gtk-doc \
+	--enable-static \
+	--with-gtk=3.0 \
+	--with-html-dir=%{_gtkdocdir} \
+	--with-pam-dir=/%{_lib}/security \
+	--with-root-certs=%{_sysconfdir}/certs
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	pkgconfigdir=%{_pkgconfigdir}
+%{__make} install install-pam \
+	DESTDIR=$RPM_BUILD_ROOT
 
-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+%{__rm} $RPM_BUILD_ROOT/%{_lib}/security/pam_gnome_keyring.{l,}a
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/pkcs11/gnome-keyring-pkcs11.{l,}a
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/gnome-keyring/devel/*.{l,}a
 
-%find_lang %{name} --with-gnome --all-name
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%posttrans
+%glib_compile_schemas
+
+%postun
+if [ "$1" = "0" ]; then
+	%glib_compile_schemas
+fi
+
 %post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README TODO
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libexecdir}/%{name}-ask
+%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
+%dir %{_libdir}/%{name}
+%attr(755,root,root) %{_libexecdir}/gnome-keyring-prompt
+%attr(755,root,root) %{_libexecdir}/gnome-keyring-prompt-3
+%attr(755,root,root) %{_libdir}/pkcs11/gnome-keyring-pkcs11.so
+%dir %{_libdir}/%{name}/devel
+%attr(755,root,root) %{_libdir}/%{name}/devel/gkm-gnome2-store-standalone.so
+%attr(755,root,root) %{_libdir}/%{name}/devel/gkm-roots-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-gpg.desktop
+%{_sysconfdir}/xdg/autostart/gnome-keyring-pkcs11.desktop
+%{_sysconfdir}/xdg/autostart/gnome-keyring-secrets.desktop
+%{_sysconfdir}/xdg/autostart/gnome-keyring-ssh.desktop
+%{_datadir}/GConf/gsettings/*.convert
+%{_datadir}/dbus-1/services/org.freedesktop.secrets.service
+%{_datadir}/dbus-1/services/org.gnome.keyring.service
+%{_datadir}/gcr-3
+%{_datadir}/glib-2.0/schemas/*.gschema.xml
+%{_datadir}/gnome-keyring-3
+%{_desktopdir}/gnome-keyring-prompt.desktop
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%attr(755,root,root) %{_libdir}/libgcr-3.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgcr-3.so.0
+%attr(755,root,root) %{_libdir}/libgck.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgck.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-3.so
+%attr(755,root,root) %{_libdir}/libgck.so
+%{_includedir}/gcr-3
+%{_includedir}/gck
+%{_pkgconfigdir}/gcr-3.pc
+%{_pkgconfigdir}/gck-0.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libgcr-3.a
+%{_libdir}/libgck.a
+
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/gcr-3
+%{_gtkdocdir}/gck
+
+%files -n pam-pam_gnome_keyring
+%defattr(644,root,root,755)
+%attr(755,root,root) /%{_lib}/security/pam_gnome_keyring.so