- updated to 3.2.0; merged from DEVEL

Changed files:
    gnome-keyring.spec -> 1.89

diff --git a/gnome-keyring.spec b/gnome-keyring.spec
index 69f0c4e7d0bc32a15033cfbcbcd4e860faf3225a..66e8af55e91f0ebad4b5b327e8dc80e70b8724a7 100644 (file)
--- a/gnome-keyring.spec
+++ b/gnome-keyring.spec
@@ -3,12 +3,12 @@
 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:       3.0.3
+Version:       3.2.0
 Release:       1
 License:       LGPL v2+ (library), GPL v2+ (programs)
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-keyring/3.0/%{name}-%{version}.tar.bz2
-# Source0-md5: 4a3bf04f34708e9da249d3078bd36124
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-keyring/3.2/%{name}-%{version}.tar.xz
+# Source0-md5: 0f0922c66d6a412ddaa5171b5b8a2175
 URL:           http://live.gnome.org/GnomeKeyring
 BuildRequires: autoconf
 BuildRequires: automake
@@ -20,15 +20,23 @@ 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: libcap-ng-devel
 BuildRequires: libgcrypt-devel >= 1.2.2
 BuildRequires: libtasn1-devel >= 0.3.4
 BuildRequires: libtool
+BuildRequires: p11-kit-devel >= 0.6
 BuildRequires: pam-devel
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.592
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
+Requires(post,postun): desktop-file-utils
 Requires(post,postun): glib2 >= 1:2.26.0
+Requires(post,postun): gtk-update-icon-cache
+Requires(post,postun): hicolor-icon-theme
+Requires(post,postun): shared-mime-info
 Requires:      dbus >= 1.2.0
+Requires:      hicolor-icon-theme
 Conflicts:     rpm < 4.4.2-0.2
 # sr@Latn vs. sr@latin
 Conflicts:     glibc-misc < 6:2.7
@@ -141,7 +149,6 @@ w czasie logowania użytkownika i uruchamiania demona keyring.
        --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
@@ -163,13 +170,17 @@ rm -rf $RPM_BUILD_ROOT
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%posttrans
+%post
+%update_mime_database
+%update_desktop_database_post
+%update_icon_cache hicolor
 %glib_compile_schemas
 
 %postun
-if [ "$1" = "0" ]; then
-       %glib_compile_schemas
-fi
+%update_mime_database
+%update_desktop_database_postun
+%update_icon_cache hicolor
+%glib_compile_schemas
 
 %post  libs -p /sbin/ldconfig
 %postun        libs -p /sbin/ldconfig
@@ -177,6 +188,7 @@ fi
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
+%attr(755,root,root) %{_bindir}/gcr-viewer
 %attr(755,root,root) %{_bindir}/gnome-keyring
 %attr(755,root,root) %{_bindir}/gnome-keyring-3
 %attr(755,root,root) %{_bindir}/gnome-keyring-daemon
@@ -200,28 +212,32 @@ fi
 %{_datadir}/gcr-3
 %{_datadir}/glib-2.0/schemas/*.gschema.xml
 %{_datadir}/gnome-keyring-3
+%{_desktopdir}/gcr-viewer.desktop
 %{_desktopdir}/gnome-keyring-prompt.desktop
+%{_sysconfdir}/pkcs11/modules/gnome-keyring-module
+%{_iconsdir}/hicolor/*/apps/*.png
+%{_datadir}/mime/packages/gcr-crypto-types.xml
 
 %files libs
 %defattr(644,root,root,755)
 %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
+%attr(755,root,root) %ghost %{_libdir}/libgcr-3.so.1
+%attr(755,root,root) %{_libdir}/libgck-1.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgck-1.so.0
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgcr-3.so
-%attr(755,root,root) %{_libdir}/libgck.so
+%attr(755,root,root) %{_libdir}/libgck-1.so
 %{_includedir}/gcr-3
-%{_includedir}/gck
+%{_includedir}/gck-1
 %{_pkgconfigdir}/gcr-3.pc
-%{_pkgconfigdir}/gck-0.pc
+%{_pkgconfigdir}/gck-1.pc
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libgcr-3.a
-%{_libdir}/libgck.a
+%{_libdir}/libgck-1.a
 
 %files apidocs
 %defattr(644,root,root,755)