Hello community, here is the log from the commit of package gnome-keyring for openSUSE:Factory checked in at 2012-01-09 15:16:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-keyring (Old) and /work/SRC/openSUSE:Factory/.gnome-keyring.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-keyring", Maintainer is "gnome-maintainers@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-keyring/gnome-keyring.changes 2011-11-08 17:36:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-keyring.new/gnome-keyring.changes 2012-01-09 15:16:33.000000000 +0100 @@ -1,0 +2,82 @@ +Wed Dec 21 13:52:43 UTC 2011 - vuntz@opensuse.org + +- Update to version 3.3.3.1: + + No message in gnome-keyring-pkcs11.so module, when no daemon + running + + Build fixes + + Updated translations. +- Drop gnome-keyring-fix-build.patch: fixed upstream. + +------------------------------------------------------------------- +Mon Dec 19 12:39:04 UTC 2011 - vuntz@opensuse.org + +- Update to version 3.3.3: + + Distribute correct desktop autostart files + + Use GcrPrompt and GcrSystemPrompt for prompting + + Do not crash when reading a truncated keyring file + + Add test tool for dumping the keyring format + + Update for GckBuilder changes in libgck + + Fix for deprecations in glib 2.31.x + + Fix ReadAlias() returning null when 'login' keyring exists + + Build fixes, bug fixes +- Add xz BuildRequires because we can't build a package for a + xz-compressed tarball without explicitly specifying that... See + bnc#697467 for more details. +- Add gnome-keyring-fix-build.patch: add some libraries during + linkage, to fix build; taken from git. +- Change libgck Requires in libgck-modules-gnome-keyring to gck: + this is a new Provides in libgck to help us for this Requires, so + we don't have a Requires on a shared library package, whose name + can change. Note that we don't version the Requires: there's no + reason for this. + +------------------------------------------------------------------- +Mon Nov 28 16:41:37 UTC 2011 - dimstar@opensuse.org + +- Fix libgck Requires in libgck-modules-gnome-keyring: as libgck + got split out, we can't assume any longer that the version will + always be the same as the one of the main package. For now at + least we assume that we can maintain the library name. + +------------------------------------------------------------------- +Mon Nov 21 13:46:07 UTC 2011 - dimstar@opensuse.org + +- Update to version 3.3.2: + + Do not make label selectionnable in prompt dialog + + Fix deadlock in the 'unsafe storage' prompt + + Better locking for the old gnome2-store + + Build fixes + + Updated translations. +- Drop gnome-keyring-remove-xfce-lxde-autostart.patch: fixed + upstream. + +------------------------------------------------------------------- +Tue Nov 8 20:38:22 UTC 2011 - dimstar@opensuse.org + +- Update to version 3.3.1.1: + + Build correctly against glib 2.31 +- Changes from version 3.3.1: + + Return most recent secret first when searching + + Split the Gcr and Gck libraries out of gnome-keyring + + Build fixes + + Updated translations. +- Rebase gnome-keyring-remove-xfce-lxde-autostart.patch. +- Remove BuildRequires that have moved to the new gcr source + package: shared-mime-info, pkgconfig(p11-kit-1). +- Add pkgconfig(gck-1) and pkgconfig(gcr-3) BuildRequires: newly + depend on the split out library, +- Drop libgcr-3-1, libgcr-devel, libgck-1-0 and libgck-devel + subpackages: upstream split the libraries out. +- Rename libgck-modules to libgck-modules-gnome-keyring: since + libgck is split away from gnome-keyring, we cannot use a generic + package name like this anymore. Add appropriate Obsoletes, but + no Provides as there could be another libgck-modules package + appearing in the future. +- Stop calling %mime_database_post(un) in %post/%postun and stop + passing --disable-update-mime to configure: the mime definition + moved to the gcr source package. +- Add missing calls to %desktop_database_post(un) in %post/%postun. +- Use grep -F instead of deprecated fgrep in %post of pam + subpackage. + +------------------------------------------------------------------- Old: ---- gnome-keyring-3.2.1.tar.bz2 gnome-keyring-remove-xfce-lxde-autostart.patch New: ---- gnome-keyring-3.3.3.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-keyring.spec ++++++ --- /var/tmp/diff_new_pack.4Hcnc0/_old 2012-01-09 15:16:35.000000000 +0100 +++ /var/tmp/diff_new_pack.4Hcnc0/_new 2012-01-09 15:16:35.000000000 +0100 @@ -15,20 +15,16 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: gnome-keyring -Version: 3.2.1 -Release: 1 +Version: 3.3.3.1 +Release: 0 Url: http://www.gnome.org/ -Group: System/GUI/GNOME -License: GPLv2+ ; LGPLv2.1+ Summary: GNOME Keyring -Source: http://download.gnome.org/sources/gnome-keyring/3.2/%{name}-%{version}.tar.bz2 +License: GPL-2.0+ ; LGPL-2.1+ +Group: System/GUI/GNOME +Source: http://download.gnome.org/sources/gnome-keyring/3.3/%{name}-%{version}.tar.xz Source99: baselibs.conf -# PATCH-FIX-UPSTREAM gnome-keyring-remove-xfce-lxde-autostart.patch bnc#710038 bgo#660240 gber@opensuse.org -- Do not start the gnome-keyring daemon for LXDE or Xfce via XDG autostart, that only works with gnome-session -Patch0: gnome-keyring-remove-xfce-lxde-autostart.patch # PATCH-FEATURE-OPENSUSE gnome-keyring-check-session.patch vuntz@novell.com -- Only start gnome-keyring in the pam module if GNOME, Xfce or LXDE is started Patch4: gnome-keyring-check-session.patch # PATCH-FIX-OPENSUSE gnome-keyring-pam-auth-prompt-password.patch bnc466732 bgo560488 vuntz@novell.com -- Make the pam module prompt the password in auth, so we can use pam-config. This is a workaround until bnc#477488 is implemented. @@ -41,21 +37,22 @@ BuildRequires: libgcrypt-devel BuildRequires: libselinux-devel BuildRequires: pam-devel -# We need the %%mime_database_* macros -BuildRequires: shared-mime-info BuildRequires: translation-update-upstream BuildRequires: update-desktop-files +# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 +BuildRequires: xz BuildRequires: pkgconfig(dbus-1) -BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gck-1) >= 3.3.3 +BuildRequires: pkgconfig(gcr-3) >= 3.3.3 +BuildRequires: pkgconfig(glib-2.0) >= 2.28.0 BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libtasn1) -BuildRequires: pkgconfig(p11-kit-1) >= 0.6 %if 0%{?BUILD_FROM_VCS} BuildRequires: gnome-common BuildRequires: gtk-doc %endif PreReq: permissions -Requires: libgck-modules = %{version} +Requires: libgck-modules-gnome-keyring = %{version} Recommends: %{name}-lang Recommends: %{name}-pam # bug437293 @@ -75,65 +72,18 @@ password, and there is also a session keyring which is never stored to disk, but forgotten when the session ends. -%package -n libgcr-3-1 -License: GPLv2+ ; LGPLv2.1+ -Group: System/GUI/GNOME -Summary: Library for Crypto UI related task -Recommends: %{name} = %{version} - -%description -n libgcr-3-1 -GCR is a library for crypto UI and related tasks. - -%package -n libgcr-devel -License: GPLv2+ ; LGPLv2.1+ -Group: Development/Libraries/GNOME -Summary: Library for Crypto UI related task - Development Files -Requires: libgcr-3-1 = %{version} - -%description -n libgcr-devel -The GNOME Keyring is a daemon in the session, similar to ssh-agent, -and other applications can use it to store passwords and other -sensitive information. - -The program can manage several keyrings, each with its own master -password, and there is also a session keyring which is never stored to -disk, but forgotten when the session ends. - -%package -n libgck-1-0 -License: GPLv2+ ; LGPLv2.1+ -Group: System/GUI/GNOME -Summary: GObject bindings for PKCS#11 -Recommends: libgck-modules = %{version} - -%description -n libgck-1-0 -GCK is a wrapper based on GLib implementing the PKCS#11 (Cryptoki) -interface. - -%package -n libgck-devel -License: GPLv2+ ; LGPLv2.1+ -Group: Development/Libraries/GNOME -Summary: GObject bindings for PKCS#11 - Development Files -Requires: libgck-1-0 = %{version} - -%description -n libgck-devel -The GNOME Keyring is a daemon in the session, similar to ssh-agent, -and other applications can use it to store passwords and other -sensitive information. - -The program can manage several keyrings, each with its own master -password, and there is also a session keyring which is never stored to -disk, but forgotten when the session ends. - -%package -n libgck-modules -License: GPLv2+ ; LGPLv2.1+ -Group: System/GUI/GNOME +%package -n libgck-modules-gnome-keyring Summary: Glib wrapper library for PKCS#11 - Modules -Requires: libgck-1-0 = %{version} +# libgck-X-Y has a Provides for gck, just to help us with this Requires +Requires: gck # libgp11 used to be the library providing all this. It turns out the # modules are, as of 2.91.3, installed in the same place Obsoletes: libgp11-modules < %{version} +# starting with 3.3, libgck got split from gnome-keyring and so we can't use a +# generic name like libgck-modules anymore. +Obsoletes: libgck-modules < %{version} -%description -n libgck-modules +%description -n libgck-modules-gnome-keyring GCK is a wrapper based on GLib implementing the PKCS#11 (Cryptoki) interface. @@ -141,8 +91,6 @@ certificates from different sources. %package pam -License: GPLv2+ ; LGPLv2.1+ -Group: System/GUI/GNOME Summary: GNOME Keyring - PAM module Requires: %{name} = %{version} PreReq: pam-config >= 0.72 @@ -166,7 +114,6 @@ %prep %setup -q translation-update-upstream -%patch0 -p1 %patch4 -p1 %patch5 -p1 @@ -181,24 +128,19 @@ %if 0%{?BUILD_FROM_VCS} --enable-gtk-doc \ %endif - --with-root-certs=%{_sysconfdir}/ssl/certs \ - --disable-update-mime + --with-root-certs=%{_sysconfdir}/ssl/certs make %{?jobs:-j%jobs} V=1 %install %makeinstall -# we don't want to ship a test module -rm %{buildroot}/%{_libdir}/libmock-test-module.so find %{buildroot} -type f -name "*.la" -delete -print # XFCE team wants gnome-keyring to work by default. for i in %{buildroot}%{_sysconfdir}/xdg/autostart/*.desktop ; do desktop-file-install --dir=%{buildroot}%{_sysconfdir}/xdg/autostart --add-only-show-in=XFCE $i done %find_lang %{name} -%suse_update_desktop_file gcr-viewer %suse_update_desktop_file gnome-keyring-gpg %suse_update_desktop_file gnome-keyring-pkcs11 -%suse_update_desktop_file gnome-keyring-prompt %suse_update_desktop_file gnome-keyring-secrets %suse_update_desktop_file gnome-keyring-ssh %fdupes %{buildroot} @@ -209,26 +151,14 @@ %post %set_permissions %{_bindir}/gnome-keyring-daemon %glib2_gsettings_schema_post -%mime_database_post +%desktop_database_post %verifyscript %verify_permissions -e %{_bindir}/gnome-keyring-daemon %postun %glib2_gsettings_schema_postun -%mime_database_postun - -%post -n libgcr-3-1 -/sbin/ldconfig -%icon_theme_cache_post - -%postun -n libgcr-3-1 -/sbin/ldconfig -%icon_theme_cache_postun - -%post -n libgck-1-0 -p /sbin/ldconfig - -%postun -n libgck-1-0 -p /sbin/ldconfig +%desktop_database_postun ### # WARNING: when changing the pam-config calls in the scriptlets, please also @@ -245,7 +175,7 @@ # Note: this can safely be done after pam-config, since pam-config doesn't # touch /etc/pam.d/gdm if test -f etc/pam.d/gdm; then -if fgrep -q pam_gnome_keyring.so etc/pam.d/gdm ; then +if grep -F -q pam_gnome_keyring.so etc/pam.d/gdm ; then sed -i '/ pam_gnome_keyring\.so/d' etc/pam.d/gdm fi fi @@ -261,68 +191,26 @@ %{_bindir}/gnome-keyring %{_bindir}/gnome-keyring-3 %{_bindir}/gnome-keyring-daemon -%{_libexecdir}/gnome-keyring-prompt -%{_libexecdir}/gnome-keyring-prompt-3 %{_sysconfdir}/pkcs11/modules/gnome-keyring-module %dir %{_libdir}/pkcs11 %{_libdir}/pkcs11/gnome-keyring-pkcs11.so %{_datadir}/dbus-1/services/org.freedesktop.secrets.service %{_datadir}/dbus-1/services/org.gnome.keyring.service -%dir %{_datadir}/gnome-keyring-3 -%dir %{_datadir}/gnome-keyring-3/ui -%{_datadir}/gnome-keyring-3/ui/gku-prompt.ui # Own the directory since we can't depend on gconf providing them %dir %{_datadir}/GConf %dir %{_datadir}/GConf/gsettings %{_datadir}/GConf/gsettings/org.gnome.crypto.cache.convert -%{_datadir}/GConf/gsettings/org.gnome.crypto.pgp.convert -%{_datadir}/GConf/gsettings/org.gnome.crypto.pgp_keyservers.convert -%{_datadir}/applications/gnome-keyring-prompt.desktop %{_datadir}/glib-2.0/schemas/org.gnome.crypto.cache.gschema.xml -%{_datadir}/glib-2.0/schemas/org.gnome.crypto.pgp.gschema.xml %{_sysconfdir}/xdg/autostart/*.desktop -# gcr-viewer -%{_bindir}/gcr-viewer -%{_datadir}/applications/gcr-viewer.desktop -%{_datadir}/mime/packages/gcr-crypto-types.xml %files lang -f %{name}.lang -%files -n libgcr-3-1 -%defattr (-, root, root) -%{_libdir}/libgcr-3.so.* -%{_datadir}/icons/hicolor/*/apps/gcr-key.png -%{_datadir}/icons/hicolor/*/apps/gcr-key-pair.png -%{_datadir}/gcr-3/ - -%files -n libgcr-devel -%defattr (-, root, root) -%{_libdir}/libgcr-3.so -%{_libdir}/pkgconfig/gcr-3.pc -%{_includedir}/gcr-3/ -%dir %{_datadir}/gtk-doc -%dir %{_datadir}/gtk-doc/html -%{_datadir}/gtk-doc/html/gcr-3/ - -%files -n libgck-1-0 -%defattr (-, root, root) -%{_libdir}/libgck-1.so.* -%dir %{_libdir}/gnome-keyring -%dir %{_libdir}/gnome-keyring/devel - -%files -n libgck-devel -%defattr (-, root, root) -%{_libdir}/libgck-1.so -%{_libdir}/pkgconfig/gck-1.pc -%{_includedir}/gck-1/ -%dir %{_datadir}/gtk-doc -%dir %{_datadir}/gtk-doc/html -%{_datadir}/gtk-doc/html/gck/ - -%files -n libgck-modules +%files -n libgck-modules-gnome-keyring %defattr (-, root, root) # Note: if modules move to %%{_libdir}/pkcs11, then we should remove # the libgp11-modules Obsoletes tag. +%dir %{_libdir}/gnome-keyring +%dir %{_libdir}/gnome-keyring/devel %{_libdir}/gnome-keyring/devel/gkm-gnome2-store-standalone.so %{_libdir}/gnome-keyring/devel/gkm-roots-store-standalone.so %{_libdir}/gnome-keyring/devel/gkm-secret-store-standalone.so -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org