From 3193313aff27e026298dff211a044b4f4835636c Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Oct 30 2018 05:54:39 +0000 Subject: import glib-networking-2.56.1-1.el7 --- diff --git a/.gitignore b/.gitignore index 1b56505..ebeb2f0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/glib-networking-2.50.0.tar.xz +SOURCES/glib-networking-2.56.1.tar.xz diff --git a/.glib-networking.metadata b/.glib-networking.metadata index 6582870..3fe6985 100644 --- a/.glib-networking.metadata +++ b/.glib-networking.metadata @@ -1 +1 @@ -d8f6a52fd977acc0ff32fe3152ad4cb3f699c053 SOURCES/glib-networking-2.50.0.tar.xz +afd114bee6154e3bd99d1a30d2c1a4dc118abf16 SOURCES/glib-networking-2.56.1.tar.xz diff --git a/SOURCES/glib-networking-python2.patch b/SOURCES/glib-networking-python2.patch new file mode 100644 index 0000000..fd443a8 --- /dev/null +++ b/SOURCES/glib-networking-python2.patch @@ -0,0 +1,16 @@ +--- glib-networking-2.56.0/find-ca-certificates.orig 2018-04-26 16:28:52.789161048 +0200 ++++ glib-networking-2.56.0/find-ca-certificates 2018-04-26 16:29:01.055167000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/env python + + import errno + import os +--- glib-networking-2.56.0/meson_post_install.py.orig 2018-04-26 16:28:46.194156296 +0200 ++++ glib-networking-2.56.0/meson_post_install.py 2018-04-26 16:29:15.074177106 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/env python + + import os + import subprocess diff --git a/SPECS/glib-networking.spec b/SPECS/glib-networking.spec index aa0a3ae..d959ec4 100644 --- a/SPECS/glib-networking.spec +++ b/SPECS/glib-networking.spec @@ -1,20 +1,24 @@ -%define glib2_version 2.46.0 +%define glib2_version 2.55.1 Name: glib-networking -Version: 2.50.0 +Version: 2.56.1 Release: 1%{?dist} Summary: Networking support for GLib License: LGPLv2+ URL: http://www.gnome.org -Source0: http://download.gnome.org/sources/glib-networking/2.50/%{name}-%{version}.tar.xz +Source0: http://download.gnome.org/sources/glib-networking/2.56/%{name}-%{version}.tar.xz +# Downstream RHEL patches: +Patch0: glib-networking-python2.patch + +BuildRequires: gettext BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: libproxy-devel BuildRequires: gnutls-devel -BuildRequires: intltool BuildRequires: ca-certificates BuildRequires: gsettings-desktop-schemas-devel +BuildRequires: meson BuildRequires: systemd Requires: ca-certificates @@ -39,14 +43,11 @@ the functionality of the installed glib-networking package. %autosetup -p1 %build -%configure --disable-static --with-libproxy --enable-installed-tests - -make %{?_smp_mflags} V=1 +%meson -Dinstalled_tests=true +%meson_build %install -%make_install - -rm -f $RPM_BUILD_ROOT%{_libdir}/gio/modules/*.la +%meson_install %find_lang %{name} @@ -71,6 +72,10 @@ gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules %{_datadir}/installed-tests %changelog +* Tue May 22 2018 Kalev Lember - 2.56.1-1 +- Update to 2.56.1 +- Resolves: #1567374 + * Mon Sep 19 2016 Kalev Lember - 2.50.0-1 - Update to 2.50.0 - Resolves: #1386876