Accepting request 586197 from GNOME:Factory

Update to 3.28.0 (forwarded request 585958 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/586197
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gcr?expand=0&rev=32

gcr-3.20.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:90572c626d8a708225560c42b4421f7941315247fa1679d4ef569bde7f4bb379
-size 1324216

gcr-3.28.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:15e175d1da7ec486d59749ba34906241c442898118ce224a7b70bf2e849faf0b
+size 1329044

gcr-bsc932232-use-libgcrypt-allocators.patch

@@ -2,7 +2,7 @@ diff --git a/egg/egg-libgcrypt.c b/egg/egg-libgcrypt.c
 index 0ba84fe..cca36f1 100644
 --- a/egg/egg-libgcrypt.c
 +++ b/egg/egg-libgcrypt.c
-@@ -105,11 +105,6 @@ egg_libgcrypt_initialize (void)
+@@ -71,11 +71,6 @@ egg_libgcrypt_initialize (void)
  			gcry_set_log_handler (log_handler, NULL);
  			gcry_set_outofcore_handler (no_mem_handler, NULL);
  			gcry_set_fatalerror_handler (fatal_handler, NULL);

gcr.changes

@@ -1,3 +1,66 @@
+-------------------------------------------------------------------
+Mon Mar 12 15:10:21 UTC 2018 - dimstar@opensuse.org
+
+- Update to version 3.28.0:
+  + Fix year 2038 workaround in ASN.1 decoder (bgo#787963).
+  + Fix test errors when ssh-keygen is not found.
+  + Updated translations.
+
+-------------------------------------------------------------------
+Sun Mar 11 09:16:50 UTC 2018 - dimstar@opensuse.org
+
+- Supplement the new gcr-ssh-askpass for gpg2 and gnome-shell:
+  GNOME users want to have this available to enter the ssh key
+  passwords.
+
+-------------------------------------------------------------------
+Fri Mar  9 16:42:27 UTC 2018 - jengelh@inai.de
+
+- Fix SRPM group. Update package summaries.
+
+-------------------------------------------------------------------
+Mon Mar  5 19:05:27 UTC 2018 - dimstar@opensuse.org
+
+- Update to version 3.27.92:
+  + Provide API for reliably calling ssh programs (bgo#735873).
+  + Updated translations.
+- Split new subpackage gcr-ssh-askpass, recommended by the main
+  library.
+
+-------------------------------------------------------------------
+Wed Feb 28 16:25:51 UTC 2018 - dimstar@opensuse.org
+
+- Modernize spec-file by calling spec-cleaner
+
+-------------------------------------------------------------------
+Tue Feb 27 04:27:04 UTC 2018 - luc14n0@linuxmail.org
+
+- Update to version 3.27.4:
+  + Fixes:
+    - Encoding of EC parameters (bgo#785234).
+    - Hang in certificate export dialog (bgo#789804).
+    - Failure case in gcr_secure_memory_try_realloc() (bgo#775685).
+  + Switch to using GLib resources.
+  + Build fixes: bgo#771052, bgo#775685, bgo#775966, bgo#774312,
+    bgo#774311, bgo#764562, bgo#764569.
+  + Updated translations.
+- Drop %desktop_database_*, %mime_database_*, %icon_theme_cache_*
+  and %glib2_gsettings_schema_* post/postun scriptlets and
+  %glib2_gsettings_schema_requires macro: they're no longer needed
+  since RPM File Triggers cover their functionality now.
+- Drop shared-mime-info BuildRequires: it's no longer needed now
+  that its macros are not used anymore.
+- Drop pkgconfig(libtasn1) BuildRequires: it's no longer needed nor
+  used anymore.
+- Adopt the use of %make_build macro rather than raw make command,
+  following the best practices.
+- Add gtk-doc BuildRequires and pass enable-gtk-doc to configure as
+  the API's documentation is desired.
+- Add pkgconfig(gtk+-x11-3.0) BuildRequires: it was being pulled
+  by gtk+-3.0 pkgconfig module and used already, since both of them
+  lives in gtk3-devel package.
+- Rebase gcr-bsc932232-use-libgcrypt-allocators.patch.
+
 -------------------------------------------------------------------
 Tue Feb 27 04:05:25 UTC 2018 - dimstar@opensuse.org
 
@@ -6,7 +69,7 @@ Tue Feb 27 04:05:25 UTC 2018 - dimstar@opensuse.org
 -------------------------------------------------------------------
 Mon Feb 26 20:11:42 UTC 2018 - crrodriguez@opensuse.org
 
-- Add explicit pkgconfig(pango) and pkgconfig(cairo) BuildRequires: 
+- Add explicit pkgconfig(pango) and pkgconfig(cairo) BuildRequires:
   closer alignment with what configure checks for.
 
 -------------------------------------------------------------------

gcr.spec

@@ -17,14 +17,14 @@
 
 
 Name:           gcr
-Version:        3.20.0
+Version:        3.28.0
 Release:        0
 # FIXME: Verify if the requires in typelib-1_0-Gcr-3 is still correct and required (see bgo#725501).
-Summary:        Library for Crypto UI related task
+Summary:        Library for Crypto UI related tasks
 License:        LGPL-2.1-or-later
-Group:          System/Libraries
+Group:          Development/Libraries/GNOME
-Url:            http://www.gnome.org
+URL:            http://www.gnome.org
-Source0:        http://download.gnome.org/sources/gcr/3.20/%{name}-%{version}.tar.xz
+Source0:        http://download.gnome.org/sources/gcr/3.28/%{name}-%{version}.tar.xz
 Source1:        baselibs.conf
 # PATCH-FIX-SLE gcr-bsc932232-use-libgcrypt-allocators.patch bsc#932232 hpj@suse.com -- use libgcrypt allocators for FIPS mode
 Patch1:         gcr-bsc932232-use-libgcrypt-allocators.patch
@@ -33,10 +33,10 @@ BuildRequires:  dbus-1
 BuildRequires:  gobject-introspection-devel >= 1.34
 # configure is looking for the gpg2 path
 BuildRequires:  gpg2
+BuildRequires:  gtk-doc
 BuildRequires:  intltool
-BuildRequires:  libgcrypt-devel >= 1.2.2
+BuildRequires:  libgcrypt-devel >= 1.4.5
-# We need the %%mime_database_* macros
+BuildRequires:  pkgconfig
-BuildRequires:  shared-mime-info
 BuildRequires:  update-desktop-files
 BuildRequires:  vala >= 0.18.0.22
 BuildRequires:  xsltproc
@@ -48,10 +48,9 @@ BuildRequires:  pkgconfig(gmodule-no-export-2.0)
 BuildRequires:  pkgconfig(gobject-2.0)
 BuildRequires:  pkgconfig(gthread-2.0)
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.12
-BuildRequires:  pkgconfig(libtasn1)
+BuildRequires:  pkgconfig(gtk+-x11-3.0) >= 3.12
 BuildRequires:  pkgconfig(p11-kit-1) >= 0.19.0
 BuildRequires:  pkgconfig(pango)
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 GCR is a library for displaying certificates, and crypto UI, accessing
@@ -72,26 +71,34 @@ This packages provides the viewer for crypto files on the GNOME desktop.
 %package data
 Summary:        Data and icon set for gcr
 Group:          System/Libraries
-%glib2_gsettings_schema_requires
 
 %description data
 This package provides the GSettings schemas and a collection of icons
 needed by libgcr.
 
 %package prompter
-Summary:        Prompt dialog for Crypto UI related task
+Summary:        Prompt dialog for gcr
 Group:          System/Libraries
 
 %description prompter
 This package provides the prompt dialog needed by libgcr.
 
+%package ssh-askpass
+Summary:        SSH password callback helper for gcr
+Group:          System/Libraries
+Supplements:    packageand(gpg2:gnome-shell)
+
+%description ssh-askpass
+gcr-ssh-askpass allows an ssh command to callback for a password.
+
 %package -n libgcr-3-1
-Summary:        Library for Crypto UI related task
+Summary:        Library for Crypto UI related tasks
 Group:          System/Libraries
 Requires:       %{name}-data >= %{version}
 Requires:       %{name}-prompter >= %{version}
-Recommends:     %{name}-viewer = %{version}
+Recommends:     %{name}-ask-pass
 Recommends:     %{name}-lang
+Recommends:     %{name}-viewer = %{version}
 # To make lang package installable
 Provides:       %{name} = %{version}
 
@@ -100,7 +107,7 @@ GCR is a library for displaying certificates, and crypto UI, accessing
 key stores.
 
 %package -n typelib-1_0-Gcr-3
-Summary:        Library for Crypto UI related task -- Introspection bindings
+Summary:        Introspection bindings for gcr, a library for crypto UI related tasks
 # Due to broken typelib files, this one cannot be automatically inspected
 Group:          System/Libraries
 Requires:       typelib-1_0-Gck-1
@@ -112,7 +119,7 @@ key stores.
 This package provides the GObject Introspection bindings for GCR.
 
 %package -n typelib-1_0-GcrUi-3
-Summary:        Library for Crypto UI related task -- Introspection bindings
+Summary:        Introspection bindings for gcr, a library for crypto UI related tasks
 Group:          System/Libraries
 
 %description -n typelib-1_0-GcrUi-3
@@ -122,7 +129,7 @@ key stores.
 This package provides the GObject Introspection bindings for GCR.
 
 %package -n libgcr-devel
-Summary:        Library for Crypto UI related task - Development Files
+Summary:        Development files for gcr, a library for crypto UI related tasks
 Group:          Development/Libraries/GNOME
 Requires:       libgcr-3-1 = %{version}
 Requires:       typelib-1_0-Gcr-3 = %{version}
@@ -133,7 +140,7 @@ GCR is a library for displaying certificates, and crypto UI, accessing
 key stores.
 
 %package -n libgck-1-0
-Summary:        GObject library to access for PKCS#11 modules
+Summary:        GObject library to access PKCS#11 modules
 Group:          System/Libraries
 Recommends:     %{name}-lang
 # Small hack, to help gnome-keyring subpackage containing gck
@@ -146,7 +153,7 @@ GCK is a library for accessing PKCS#11 modules like smart cards, in a
 (G)object oriented way.
 
 %package -n typelib-1_0-Gck-1
-Summary:        GObject library to access for PKCS#11 modules -- Introspection bindings
+Summary:        Introspection bindings for gck, a GObject library to access PKCS#11 modules
 Group:          System/Libraries
 
 %description -n typelib-1_0-Gck-1
@@ -156,7 +163,7 @@ GCK is a library for accessing PKCS#11 modules like smart cards, in a
 This package provides the GObject Introspection bindings for GCK.
 
 %package -n libgck-devel
-Summary:        GObject library to access for PKCS#11 modules - Development Files
+Summary:        Development files for gck, a GObject library to access PKCS#11 modules
 Group:          Development/Libraries/GNOME
 Requires:       libgck-1-0 = %{version}
 Requires:       typelib-1_0-Gck-1 = %{version}
@@ -166,22 +173,18 @@ GCK is a library for accessing PKCS#11 modules like smart cards, in a
 (G)object oriented way.
 
 %lang_package
+
 %prep
 %setup -q
-if ! grep GLib.Object * -r -l; then
-  echo "Remove this hack.. it's fixed in the code base."
-else
-  for file in $(grep GLib.Object * -r -l); do
-    sed -i "s:GLib.Object:GObject.Object:g" $file
-  done
-fi
 %if !0%{?is_opensuse}
 %patch1 -p1
 %endif
 
 %build
-%configure
+%configure \
-make %{?_smp_mflags}
+    --disable-static \
+    --enable-gtk-doc
+%make_build
 
 %install
 %make_install
@@ -190,32 +193,12 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %suse_update_desktop_file gcr-viewer
 %find_lang %{name}
 
-%post viewer
-%desktop_database_post
-%mime_database_post
-
-%postun viewer
-%desktop_database_postun
-%mime_database_postun
-
-%post data
-%glib2_gsettings_schema_post
-%icon_theme_cache_post
-
-%postun data
-%glib2_gsettings_schema_postun
-%icon_theme_cache_postun
-
 %post -n libgcr-3-1 -p /sbin/ldconfig
-
 %postun -n libgcr-3-1 -p /sbin/ldconfig
-
 %post -n libgck-1-0 -p /sbin/ldconfig
-
 %postun -n libgck-1-0 -p /sbin/ldconfig
 
 %files viewer
-%defattr(-,root,root)
 %license COPYING
 %doc AUTHORS ChangeLog HACKING NEWS README
 %{_bindir}/gcr-viewer
@@ -223,7 +206,7 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %{_datadir}/mime/packages/gcr-crypto-types.xml
 
 %files data
-%defattr(-, root, root)
+%doc AUTHORS ChangeLog HACKING NEWS README
 %{_datadir}/icons/hicolor/*/apps/*
 # Own the directory since we can't depend on gconf providing them
 %dir %{_datadir}/GConf
@@ -233,57 +216,52 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %{_datadir}/glib-2.0/schemas/org.gnome.crypto.pgp.gschema.xml
 
 %files prompter
-%defattr(-, root, root)
 %{_libexecdir}/gcr-prompter
 %{_datadir}/applications/gcr-prompter.desktop
 %{_datadir}/dbus-1/services/org.gnome.keyring.PrivatePrompter.service
 %{_datadir}/dbus-1/services/org.gnome.keyring.SystemPrompter.service
 
+%files ssh-askpass
+%{_prefix}/lib/gcr-ssh-askpass
+
 %files -n libgcr-3-1
-%defattr (-, root, root)
 %license COPYING
 %doc AUTHORS ChangeLog HACKING NEWS README
 %{_libdir}/libgcr-3.so.*
 %{_libdir}/libgcr-base-3.so.*
 %{_libdir}/libgcr-ui-3.so.*
-%{_datadir}/gcr-3/
 
 %files -n typelib-1_0-Gcr-3
-%defattr(-,root,root)
 %{_libdir}/girepository-1.0/Gcr-3.typelib
 
 %files -n typelib-1_0-GcrUi-3
-%defattr(-,root,root)
 %{_libdir}/girepository-1.0/GcrUi-3.typelib
 
 %files -n libgcr-devel
-%defattr (-, root, root)
+%doc %{_datadir}/gtk-doc/html/gcr-3/
 %{_libdir}/libgcr-3.so
 %{_libdir}/libgcr-base-3.so
 %{_libdir}/libgcr-ui-3.so
 %{_libdir}/pkgconfig/gcr-3.pc
 %{_libdir}/pkgconfig/gcr-base-3.pc
 %{_libdir}/pkgconfig/gcr-ui-3.pc
-%{_includedir}/gcr-3/
+%dir %{_includedir}/gcr-3
-%{_datadir}/gtk-doc/html/gcr-3/
+%{_includedir}/gcr-3
 %{_datadir}/gir-1.0/GcrUi-3.gir
 
 %files -n libgck-1-0
-%defattr (-, root, root)
 %license COPYING
 %doc AUTHORS ChangeLog HACKING NEWS README
 %{_libdir}/libgck-1.so.*
 
 %files -n typelib-1_0-Gck-1
-%defattr(-,root,root)
 %{_libdir}/girepository-1.0/Gck-1.typelib
 
 %files -n libgck-devel
-%defattr (-, root, root)
+%doc %{_datadir}/gtk-doc/html/gck/
 %{_libdir}/libgck-1.so
 %{_libdir}/pkgconfig/gck-1.pc
 %{_includedir}/gck-1/
-%{_datadir}/gtk-doc/html/gck/
 %{_datadir}/gir-1.0/Gck-1.gir
 %{_datadir}/gir-1.0/Gcr-3.gir
 %{_datadir}/vala/vapi/