diff --git a/backport-skip-tls_interaction-test.patch b/backport-skip-tls_interaction-test.patch deleted file mode 100644 index ee4103c64af7c472902776397957b4c87690595b..0000000000000000000000000000000000000000 --- a/backport-skip-tls_interaction-test.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: libsoup-2.72.0/tests/ssl-test.c -=================================================================== ---- libsoup-2.72.0.orig/tests/ssl-test.c -+++ libsoup-2.72.0/tests/ssl-test.c -@@ -370,6 +370,9 @@ do_tls_interaction_test (void) - - SOUP_TEST_SKIP_IF_NO_TLS; - -+ g_test_skip ("Not reliable? See https://gitlab.gnome.org/GNOME/libsoup/issues/120"); -+ return; -+ - service = g_threaded_socket_service_new (1); - address = g_inet_socket_address_new_from_string ("127.0.0.1", 0); - g_socket_listener_add_address (G_SOCKET_LISTENER (service), address, - diff --git a/libsoup-2.74.2.tar.xz b/libsoup-2.74.2.tar.xz deleted file mode 100644 index f4d940698fe69e5b6fc22c6f1e67eb369fad6d34..0000000000000000000000000000000000000000 Binary files a/libsoup-2.74.2.tar.xz and /dev/null differ diff --git a/libsoup-3.2.2.tar.xz b/libsoup-3.2.2.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..17cd98b27525b5d27e14e82351f1f6a898ff8bed Binary files /dev/null and b/libsoup-3.2.2.tar.xz differ diff --git a/libsoup.spec b/libsoup.spec index c4e838ba60986acb4260e2e212db926eb165d833..95a3d559a3421eb54f990240d133cc18905f84b4 100644 --- a/libsoup.spec +++ b/libsoup.spec @@ -1,69 +1,101 @@ -Name: libsoup -Version: 2.74.2 -Release: 2 -Summary: An HTTP library implementation -License: LGPLv2 -URL: https://wiki.gnome.org/Projects/libsoup -Source0: https://download.gnome.org/sources/%{name}/2.74/%{name}-%{version}.tar.xz -BuildRequires: glib2-devel glib-networking krb5-devel gobject-introspection-devel gettext -BuildRequires: libxml2-devel libpsl-devel sqlite-devel vala gtk-doc meson libxslt -BuildRequires: samba-winbind-clients brotli-devel -BuildRequires: pkgconfig(sysprof-capture-4) - -Requires: glib2 glib-networking - -Patch6000: backport-skip-tls_interaction-test.patch +%define autorelease(e:s:pb:n) %{?-p:0.}%{lua: + release_number = 1; + base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); + print(release_number + base_release_number - 1); +}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} + +%global glib2_version 2.69.1 + +Name: libsoup +Version: 3.2.2 +Release: 1 +Summary: Soup, an HTTP library implementation +License: LGPLv2 +URL: https://wiki.gnome.org/Projects/libsoup +Source0: https://download.gnome.org/sources/libsoup/3.2/libsoup-%{version}.tar.xz + +BuildRequires: gcc +BuildRequires: gettext +BuildRequires: glib-networking +BuildRequires: gi-docgen >= 2021.1 +BuildRequires: krb5-devel +BuildRequires: meson +BuildRequires: vala +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(gobject-introspection-1.0) +BuildRequires: pkgconfig(libbrotlidec) +BuildRequires: pkgconfig(libnghttp2) +BuildRequires: pkgconfig(libpsl) +BuildRequires: pkgconfig(sqlite3) +BuildRequires: pkgconfig(sysprof-capture-4) + +Recommends: glib-networking%{?_isa} >= %{glib2_version} %description -libsoup is an HTTP client/server library for GNOME. It uses GObjects and the glib main loop, -to integrate well with GNOME applications, and also has a synchronous API, -for use in threaded applications. +Libsoup is an HTTP library implementation in C. It was originally part +of a SOAP (Simple Object Access Protocol) implementation called Soup, but +the SOAP and non-SOAP parts have now been split into separate packages. -%package devel -Summary: Header files for %{name} -Requires: %{name} = %{version}-%{release} +libsoup uses the Glib main loop and is designed to work well with GTK +applications. This enables GNOME applications to access HTTP servers +on the network in a completely asynchronous fashion, very similar to +the Gtk+ programming model (a synchronous operation mode is also +supported for those who want it), but the SOAP parts were removed +long ago. -%description devel -The %{name}-devel package contains libraries and header files for %{name}. +%package devel +Summary: Header files for the Soup library +Requires: %{name}%{?_isa} = %{version}-%{release} -%package_help +%description devel +Libsoup is an HTTP library implementation in C. This package allows +you to develop applications that use the libsoup library. + +%package doc +Summary: Documentation files for %{name} +BuildArch: noarch + +%description doc +This package contains developer documentation for %{name}. %prep -%autosetup -n %{name}-%{version} -p1 +%autosetup -p1 -n libsoup-%{version} %build -%meson -Dgtk_doc=true +%meson -Ddocs=enabled -Dtests=false -Dautobahn=disabled -Dpkcs11_tests=disabled %meson_build %install %meson_install -sed -i 's/idm[0-9]\{5,32\}/idm12345678912345/g' %{buildroot}%{_datadir}/gtk-doc/html/libsoup-2.4/ix01.html -%check -%meson_test +%find_lang libsoup-3.0 -%files -%defattr(-,root,root) -%doc AUTHORS +%files -f libsoup-3.0.lang %license COPYING -%{_libdir}/*.so.* -%{_datadir}/locale/* -%{_libdir}/girepository-1.0/Soup*2.4.typelib - -%files devel -%defattr(-,root,root) -%{_includedir}/%{name}*-2.4 -%{_libdir}/*.so -%{_libdir}/pkgconfig/*.pc -%{_datadir}/gir-1.0/Soup*2.4.gir -%{_datadir}/vala/vapi/libsoup-2.4.* - -%files help -%defattr(-,root,root) -%doc README NEWS -%{_datadir}/gtk-doc/html/libsoup-2.4/* +%doc README NEWS AUTHORS +%{_libdir}/libsoup-3.0.so.0* +%dir %{_libdir}/girepository-1.0 +%{_libdir}/girepository-1.0/Soup-3.0.typelib + +%files devel +%{_includedir}/libsoup-3.0 +%{_libdir}/libsoup-3.0.so +%{_libdir}/pkgconfig/libsoup-3.0.pc +%dir %{_datadir}/gir-1.0 +%{_datadir}/gir-1.0/Soup-3.0.gir +%dir %{_datadir}/vala +%dir %{_datadir}/vala/vapi +%{_datadir}/vala/vapi/libsoup-3.0.deps +%{_datadir}/vala/vapi/libsoup-3.0.vapi + +%files doc +%{_docdir}/libsoup-3.0/ %changelog +* Tue Nov 8 2022 hkgy - 3.2.2-1 +- Upgrade to v3.2.2 + * Wed Oct 26 2022 zhouwenpei - 2.74.2-2 - Rebuild for next release