From b63088dc8a2675fd57c5d818f0b1ab3414244c727e03ea363b090ecbc6c93aae Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 9 Mar 2018 09:58:42 +0000 Subject: [PATCH] Accepting request 583512 from GNOME:Next Scripted push of project GNOME:Next OBS-URL: https://build.opensuse.org/request/show/583512 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gcr?expand=0&rev=70 --- gcr-3.20.0.tar.xz | 3 - gcr-3.27.92.tar.xz | 3 + gcr-bsc932232-use-libgcrypt-allocators.patch | 2 +- gcr.changes | 45 ++++++++++- gcr.spec | 81 +++++++------------- 5 files changed, 77 insertions(+), 57 deletions(-) delete mode 100644 gcr-3.20.0.tar.xz create mode 100644 gcr-3.27.92.tar.xz diff --git a/gcr-3.20.0.tar.xz b/gcr-3.20.0.tar.xz deleted file mode 100644 index e773a1b..0000000 --- a/gcr-3.20.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:90572c626d8a708225560c42b4421f7941315247fa1679d4ef569bde7f4bb379 -size 1324216 diff --git a/gcr-3.27.92.tar.xz b/gcr-3.27.92.tar.xz new file mode 100644 index 0000000..71a63cd --- /dev/null +++ b/gcr-3.27.92.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4d377011fe346c0d0f0d1edfb7d33ea68e0cce9a1284439c55ccf6b13a80e3e9 +size 1354076 diff --git a/gcr-bsc932232-use-libgcrypt-allocators.patch b/gcr-bsc932232-use-libgcrypt-allocators.patch index 3a139c1..1ea6031 100644 --- a/gcr-bsc932232-use-libgcrypt-allocators.patch +++ b/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); diff --git a/gcr.changes b/gcr.changes index 6043bb7..7901343 100644 --- a/gcr.changes +++ b/gcr.changes @@ -1,3 +1,46 @@ +------------------------------------------------------------------- +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 +49,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. ------------------------------------------------------------------- diff --git a/gcr.spec b/gcr.spec index 2d48d83..a26824c 100644 --- a/gcr.spec +++ b/gcr.spec @@ -17,14 +17,14 @@ Name: gcr -Version: 3.20.0 +Version: 3.27.92 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 License: LGPL-2.1-or-later Group: System/Libraries -Url: http://www.gnome.org -Source0: http://download.gnome.org/sources/gcr/3.20/%{name}-%{version}.tar.xz +URL: http://www.gnome.org +Source0: http://download.gnome.org/sources/gcr/3.27/%{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 -# We need the %%mime_database_* macros -BuildRequires: shared-mime-info +BuildRequires: libgcrypt-devel >= 1.4.5 +BuildRequires: pkgconfig 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,7 +71,6 @@ 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 @@ -85,13 +83,21 @@ Group: System/Libraries %description prompter This package provides the prompt dialog needed by libgcr. +%package ssh-askpass +Summary: SSH password callback helper +Group: System/Libraries + +%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 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} @@ -166,22 +172,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 -make %{?_smp_mflags} +%configure \ + --disable-static \ + --enable-gtk-doc +%make_build %install %make_install @@ -190,32 +192,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 +205,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 +215,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/ -%{_datadir}/gtk-doc/html/gcr-3/ +%dir %{_includedir}/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/