diff --git a/README.md b/README.md deleted file mode 100644 index 7342728d557c602f51c6d278bba9f3dd9faaf356..0000000000000000000000000000000000000000 --- a/README.md +++ /dev/null @@ -1,11 +0,0 @@ -Anolis OS -======================================= -# 代码仓库说明 -## 分支说明 ->进行代码开发工作时,请注意选择当前版本对应的分支 -* aX分支为对应大版本的主分支,如a8分支对应当前最新版本 -* aX.Y分支为对应小版本的维护分支,如a8.2分支对应8.2版本 -## 开发流程 -1. 首先fork目标分支到自己的namespace -2. 在自己的fork分支上做出修改 -3. 向对应的仓库中提交merge request,源分支为fork分支 diff --git a/glib-networking-2.74.0.tar.xz b/glib-networking-2.74.0.tar.xz deleted file mode 100644 index 9599960dbae30f70e58028655f03fee5052d9661..0000000000000000000000000000000000000000 Binary files a/glib-networking-2.74.0.tar.xz and /dev/null differ diff --git a/glib-networking-2.80.0.tar.xz b/glib-networking-2.80.0.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..aa02e6e3d3eb1172bf0d32bd9388dad5fb51996e Binary files /dev/null and b/glib-networking-2.80.0.tar.xz differ diff --git a/glib-networking.spec b/glib-networking.spec index 6ce119e71f965ea429a3d69886a049bfe7412fe7..92b5ecb90d7843399c49bcea2c4ba891eff5bed3 100644 --- a/glib-networking.spec +++ b/glib-networking.spec @@ -1,46 +1,47 @@ -%define anolis_release 3 - -%bcond_without libproxy +%define anolis_release 1 %define glib2_version 2.73.3 Name: glib-networking -Version: 2.74.0 +Version: 2.80.0 Release: %{anolis_release}%{dist} Summary: Networking support for GLib -License: LGPLv2+ +License: LGPL-2.1-or-later WITH cryptsetup-OpenSSL-exception URL: https://gitlab.gnome.org/GNOME/glib-networking -Source0: https://download.gnome.org/sources/glib-networking/2.74/%{name}-%{version}.tar.xz - -BuildRequires: gcc meson >= 0.60.0 -BuildRequires: systemd-rpm-macros ca-certificates gettext +Source0: https://download.gnome.org/sources/glib-networking/2.80/%{name}-%{version}.tar.xz + +BuildRequires: ca-certificates +BuildRequires: gcc +BuildRequires: gettext +BuildRequires: meson >= 0.60.0 +BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version} +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(gnutls) >= 3.7.4 BuildRequires: pkgconfig(gsettings-desktop-schemas) -BuildRequires: pkgconfig(gio-2.0) pkgconfig(glib-2.0) >= %{glib2_version} pkgconfig(gnutls) >= 3.7.4 -%if %{with libproxy} BuildRequires: pkgconfig(libproxy-1.0) >= 0.4.16 -%endif +BuildRequires: pkgconfig(p11-kit-1) +BuildRequires: systemd-rpm-macros Requires: ca-certificates Requires: glib2 >= %{glib2_version} Requires: gsettings-desktop-schemas +# For glib-pacrunner Recommends: libproxy-duktape %description -Network-related giomodules for glib - -glib-networking contains the implementations of certain GLib networking features -that cannot be implemented directly in GLib itself because of their -dependencies. - -Currently it contains GnuTLS and OpenSSL-based implementations of GTlsBackend, -a libproxy-based implementation of GProxyResolver, GLibproxyResolver, -and a GNOME GProxyResolver that uses the proxy information from the GSettings -schemas in gsettings-desktop-schemas. +This package contains modules that extend the networking support in +GIO. In particular, it contains libproxy- and GSettings-based +GProxyResolver implementations and a gnutls-based GTlsConnection +implementation. %package tests Summary: Tests for the glib-networking package +# glib-networking-2.78.0/tls/tests/mock-pkcs11.c is Apache-2.0 +# pkcs11t.h is LicenseRef-RSA +# dtls-connection.c is LGPL-2.0-or-later but not currently included in the binaries +License: LGPL-2.1-or-later WITH cryptsetup-OpenSSL-exception AND Apache-2.0 AND LicenseRef-RSA Requires: %{name} = %{EVR} %description tests @@ -59,12 +60,7 @@ The %{name}-doc package contains documentation files for %{name}. %autosetup -n %{name}-%{version} -p1 %build -%meson \ -%if %{without libproxy} - -Dlibproxy=disabled \ -%endif - -Dinstalled_tests=true \ - %nil +%meson -Dinstalled_tests=true %meson_build %install @@ -75,22 +71,18 @@ The %{name}-doc package contains documentation files for %{name}. %generate_compatibility_deps %files -f %{name}.lang -%license COPYING +%license COPYING LICENSE_EXCEPTION %dir %{abidir} -%{_libdir}/gio/modules/libgioenvironmentproxy.so %{_libdir}/gio/modules/libgiognomeproxy.so %{_libdir}/gio/modules/libgiognutls.so -%{abidir}/libgioenvironmentproxy.dump %{abidir}/mock-pkcs11.dump %{abidir}/libgiognomeproxy.dump %{abidir}/libgiognutls.dump -%if %{with libproxy} %{_libdir}/gio/modules/libgiolibproxy.so %{abidir}/libgiolibproxy.dump %{_libexecdir}/glib-pacrunner %{_datadir}/dbus-1/services/org.gtk.GLib.PACRunner.service %{_userunitdir}/glib-pacrunner.service -%endif %files tests %{_libexecdir}/installed-tests/glib-networking @@ -100,6 +92,9 @@ The %{name}-doc package contains documentation files for %{name}. %doc NEWS README %changelog +* Tue Feb 18 2025 wangzhe - 2.80.0-1 +- Refer to CentOS Stream glib-networking-2.80.0-3 (tdawson@redhat.com) + * Fri Apr 14 2023 Heng Qi - 2.74.0-3 - Refactor the spec file