.gitignore

@@ -1 +1 @@
-SOURCES/glib-networking-2.80.0.tar.xz
+SOURCES/glib-networking-2.68.3.tar.xz

.glib-networking.metadata

@@ -1 +1 @@
-746f00f1601818ba670366c90f9511c8babec90a SOURCES/glib-networking-2.80.0.tar.xz
+c1fcfb3ff99798d532fb2640b3b0b5eb112d106c SOURCES/glib-networking-2.68.3.tar.xz

SPECS/glib-networking.spec

@@ -1,44 +1,38 @@
-## START: Set by rpmautospec
-## (rpmautospec version 0.6.5)
-## RPMAUTOSPEC: autorelease, autochangelog
-%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
-    release_number = 3;
-    base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
-    print(release_number + base_release_number - 1);
-}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
-## END: Set by rpmautospec
-
-%define glib2_version 2.73.3
+%define glib2_version 2.67.0
 
 %global tarball_version %%(echo %{version} | tr '~' '.')
 
+%global with_libproxy 1
+
 Name:           glib-networking
-Version:        2.80.0
-Release:        %autorelease
+Version:        2.68.3
+Release:        3%{?dist}
 Summary:        Networking support for GLib
 
-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.80/%{name}-%{tarball_version}.tar.xz
+License:        LGPLv2+
+URL:            http://www.gnome.org
+Source0:        http://download.gnome.org/sources/glib-networking/2.68/%{name}-%{tarball_version}.tar.xz
 
-BuildRequires:  ca-certificates
-BuildRequires:  gcc
-BuildRequires:  gettext
 BuildRequires:  meson
+BuildRequires:  gcc
 BuildRequires:  pkgconfig(glib-2.0) >= %{glib2_version}
 BuildRequires:  pkgconfig(gio-2.0)
-BuildRequires:  pkgconfig(gnutls)
-BuildRequires:  pkgconfig(gsettings-desktop-schemas)
+%if 0%{?with_libproxy}
 BuildRequires:  pkgconfig(libproxy-1.0)
+%endif
+BuildRequires:  pkgconfig(gsettings-desktop-schemas)
+BuildRequires:  pkgconfig(gnutls)
+BuildRequires:  ca-certificates
 BuildRequires:  pkgconfig(p11-kit-1)
-BuildRequires:  systemd-rpm-macros
+BuildRequires:  gettext
+BuildRequires:  systemd
 
 Requires:       ca-certificates
 Requires:       glib2%{?_isa} >= %{glib2_version}
 Requires:       gsettings-desktop-schemas
 
 # For glib-pacrunner
-Recommends:     libproxy-duktape
+Recommends:     libproxy-webkitgtk4
 
 %description
 This package contains modules that extend the networking support in
@@ -48,10 +42,6 @@ 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}%{?_isa} = %{version}-%{release}
 
 %description tests
@@ -62,152 +52,66 @@ the functionality of the installed glib-networking package.
 %autosetup -p1 -n %{name}-%{tarball_version}
 
 %build
-%meson -Dinstalled_tests=true
+%meson \
+%if !0%{?with_libproxy}
+  -Dlibproxy=disabled \
+%endif
+  -Dinstalled_tests=true \
+  %nil
 %meson_build
 
 %install
 %meson_install
 
-%check
-%meson_test
-
 %find_lang %{name}
 
 %files -f %{name}.lang
-%license COPYING LICENSE_EXCEPTION
+%license COPYING
 %doc NEWS README
 %{_libdir}/gio/modules/libgiognomeproxy.so
 %{_libdir}/gio/modules/libgiognutls.so
+%if 0%{?with_libproxy}
 %{_libdir}/gio/modules/libgiolibproxy.so
 %{_libexecdir}/glib-pacrunner
 %{_datadir}/dbus-1/services/org.gtk.GLib.PACRunner.service
 %{_userunitdir}/glib-pacrunner.service
+%endif
 
 %files tests
 %{_libexecdir}/installed-tests/glib-networking
 %{_datadir}/installed-tests
 
 %changelog
-## START: Generated by rpmautospec
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2.80.0-3
-- Bump release for October 2024 mass rebuild:
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.80.0-2
-- Bump release for June 2024 mass rebuild
-
-* Thu Apr 18 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.80.0-1
-- Update to 2.80.0
-
-* Thu Apr 18 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.80~alpha-4
-- libproxy lives! Remove the !libproxy conditionals
-
-* Thu Apr 18 2024 Tomas Popela <tpopela@redhat.com> - 2.80~alpha-3
-- Fix license tag so its validated by license-validate
-
-* Tue Apr 09 2024 Tomas Pelka <tpelka@redhat.com> - 2.80~alpha-2
-- Update file gating.yaml
-
-* Fri Jan 26 2024 David King <amigadave@amigadave.com> - 2.80~alpha-1
-- Update to 2.80.alpha
-
-* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.78.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.78.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Dec 15 2023 David King <amigadave@amigadave.com> - 2.78.0-3
-- Run tests during check phase
-
-* Fri Dec 15 2023 Miroslav Suchý <msuchy@redhat.com> - 2.78.0-2
-- Migrate to SPDX license
-
-* Sat Sep 16 2023 Kalev Lember <klember@redhat.com> - 2.78.0-1
-- Update to 2.78.0
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.76.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+* Thu Feb 24 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.68.3-3
+- Recommends: libproxy-webkitgtk4 for glib-pacrunner
+- Related: #2056988
 
-* Fri Jun 30 2023 Kalev Lember <klember@redhat.com> - 2.76.1-1
-- Update to 2.76.1
+* Tue Feb 22 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.68.3-2
+- Reenable libproxy dependency
+- Resolves: #2056988
 
-* Sat Mar 18 2023 David King <amigadave@amigadave.com> - 2.76.0-2
-- Update to 2.76.0
+* Mon Dec 06 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.68.3-1
+- Update to 2.68.3
+- Resolves: #1947187
 
-* Sat Mar 18 2023 David King <amigadave@amigadave.com> - 2.76.0-1
-- Update to 2.76.0
+* Thu Sep 02 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.68.2-1
+- Update to 2.68.2
+- Resolves: #1993765
 
-* Wed Feb 15 2023 David King <amigadave@amigadave.com> - 2.76~beta-1
-- Update to 2.76.beta
-
-* Mon Feb 13 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.76~alpha-4
-- Fix file list
-
-* Mon Feb 13 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.76~alpha-3
-- Unconditionally enable libproxy, at least for now
-
-* Mon Feb 13 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.76~alpha-2
-- Build environment proxy module only if libproxy module is disabled
-
-* Tue Feb 07 2023 David King <amigadave@amigadave.com> - 2.76~alpha-1
-- Update to 2.76.alpha
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.74.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Mon Sep 19 2022 Kalev Lember <klember@redhat.com> - 2.74.0-1
-- Update to 2.74.0
-
-* Tue Sep 06 2022 Kalev Lember <klember@redhat.com> - 2.74~rc-1
-- Update to 2.74.rc
-
-* Tue Jul 26 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.74~alpha-4
-- Restore certificate revocation checking
-
-* Tue Jul 26 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.74~alpha-3
-- libproxy-webkitgtk4 -> libproxy-duktape
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.74~alpha-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Tue Jul 12 2022 Kalev Lember <klember@redhat.com> - 2.74~alpha-1
-- Update to 2.74.alpha
-
-* Wed Mar 23 2022 David King <amigadave@amigadave.com> - 2.72.0-1
-- Update to 2.72.0
-
-* Thu Feb 24 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.72~beta-2
-- Add Recommends: libproxy-webkitgtk4, so glib-pacrunner works
-
-* Sun Feb 13 2022 David King <amigadave@amigadave.com> - 2.72~beta-1
-- Update to 42.beta
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.72~alpha-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Sat Jan 08 2022 David King <amigadave@amigadave.com> - 2.72~alpha-1
-- Update to 2.72.alpha
-
-* Thu Sep 16 2021 Kalev Lember <klember@redhat.com> - 2.70.0-1
-- Update to 2.70.0
-
-* Wed Sep 08 2021 Kalev Lember <klember@redhat.com> - 2.70~rc-1
-- Update to 2.70.rc
-
-* Mon Aug 16 2021 Kalev Lember <klember@redhat.com> - 2.70~beta-1
-- Update to 2.70.beta
-
-* Wed Aug 04 2021 Kalev Lember <klember@redhat.com> - 2.68.1-4
-- BuildRequire systemd-rpm-macros rather than systemd
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.68.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.68.1-3
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
 * Mon Jun 07 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.68.1-2
 - Disable libproxy in RHEL
+- Resolves: #1968554
 
-* Thu Apr 22 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.68.1-1
+* Mon May 03 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.68.1-1
 - Update to 2.68.1
+- Resolves: #1947188
+
+* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 2.68.0-2
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
 * Mon Mar 22 2021 Kalev Lember <klember@redhat.com> - 2.68.0-1
 - Update to 2.68.0
@@ -610,5 +514,3 @@ the functionality of the installed glib-networking package.
 
 * Thu Oct  7 2010 Matthias Clasen <mclasen@redhat.com> - 2.25.0-1
 - Initial packaging
-
-## END: Generated by rpmautospec