From 436b5f7085285cff5ac0c68060bbc16697ea2203 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 02:03:10 +0000 Subject: [PATCH 1/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- snoopy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/snoopy.spec b/snoopy.spec index 5858916..76d9366 100644 --- a/snoopy.spec +++ b/snoopy.spec @@ -1,6 +1,6 @@ Name: snoopy Version: 2.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A preload library to send shell commands to syslog License: GPL-2.0-or-later URL: https://github.com/a2o/snoopy @@ -103,6 +103,9 @@ rm %{buildroot}%{_libdir}/libsnoopy.la %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 2.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jun 03 2023 Michel Alexandre Salim - 2.5.1-1 - Update to 2.5.1 - Convert to SPDX license identifier From 28f6289d317363fb577ad685e02e149dd6ab27ca Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 03:48:14 +0000 Subject: [PATCH 2/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- snoopy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/snoopy.spec b/snoopy.spec index 76d9366..666b549 100644 --- a/snoopy.spec +++ b/snoopy.spec @@ -1,6 +1,6 @@ Name: snoopy Version: 2.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A preload library to send shell commands to syslog License: GPL-2.0-or-later URL: https://github.com/a2o/snoopy @@ -103,6 +103,9 @@ rm %{buildroot}%{_libdir}/libsnoopy.la %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 2.5.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 2.5.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 6b68ae982eb57f7d853e676d4d782afc61b042a1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 05:58:54 +0000 Subject: [PATCH 3/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- snoopy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/snoopy.spec b/snoopy.spec index 666b549..3cd5fe1 100644 --- a/snoopy.spec +++ b/snoopy.spec @@ -1,6 +1,6 @@ Name: snoopy Version: 2.5.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A preload library to send shell commands to syslog License: GPL-2.0-or-later URL: https://github.com/a2o/snoopy @@ -103,6 +103,9 @@ rm %{buildroot}%{_libdir}/libsnoopy.la %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 2.5.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 2.5.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 3338cccd85b35a4ea71925c39ab7ee9fc6cd8948 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 11:07:48 +0000 Subject: [PATCH 4/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- snoopy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/snoopy.spec b/snoopy.spec index 3cd5fe1..2995dac 100644 --- a/snoopy.spec +++ b/snoopy.spec @@ -1,6 +1,6 @@ Name: snoopy Version: 2.5.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A preload library to send shell commands to syslog License: GPL-2.0-or-later URL: https://github.com/a2o/snoopy @@ -103,6 +103,9 @@ rm %{buildroot}%{_libdir}/libsnoopy.la %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 2.5.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Jul 20 2024 Fedora Release Engineering - 2.5.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 5ec5b8bb57e8844abd67adac919f35cafad0187a Mon Sep 17 00:00:00 2001 From: Michel Lind Date: Thu, 13 Feb 2025 15:16:17 -0600 Subject: [PATCH 5/7] Remove compat subpackage on Fedora >= 42 and EPEL >= 10 Create Packit configuration to automate future updates Signed-off-by: Michel Lind --- packit.yaml | 16 ++++++++++++++++ snoopy.spec | 36 ++++++++++++++++++++++++++++++++---- 2 files changed, 48 insertions(+), 4 deletions(-) create mode 100644 packit.yaml diff --git a/packit.yaml b/packit.yaml new file mode 100644 index 0000000..fdf84eb --- /dev/null +++ b/packit.yaml @@ -0,0 +1,16 @@ +# See the documentation for more information: +# https://packit.dev/docs/configuration/ + +copy_upstream_release_description: false + +jobs: +- job: pull_from_upstream + trigger: release + dist_git_branches: + - fedora-rawhide + +- job: koji_build + trigger: commit + allowed_committers: ['packit'] + dist_git_branches: + - fedora-rawhide diff --git a/snoopy.spec b/snoopy.spec index 2995dac..40d0fc8 100644 --- a/snoopy.spec +++ b/snoopy.spec @@ -1,6 +1,16 @@ +# compat was already shipped on Fedora < 42 and EL9, even though +# they never had snoopy <= 2.4.x, +# so we need to keep it for the duration of the lifecycle, but we can drop this +# in Fedora >= 42 and RHEL >= 10 +%if (0%{?fedora} && 0%{?fedora} < 42) || (0%{?rhel} && 0%{?rhel} < 10) +%bcond_without compat +%else +%bcond_with compat +%endif + Name: snoopy Version: 2.5.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A preload library to send shell commands to syslog License: GPL-2.0-or-later URL: https://github.com/a2o/snoopy @@ -25,9 +35,17 @@ BuildRequires: %{_bindir}/hostname BuildRequires: %{_bindir}/socat BuildRequires: %{_bindir}/ps -%if 0%{?fedora} <= 38 || 0%{?el8} +%if %{with compat} +%if 0%{?el8} Recommends: %{name}-compat = %{version}-%{release} %endif +%else +# drop in Fedora 44 (upgrading from 41 no longer supported) +# and EPEL 11 +%if (0%{?fedora} && 0%{?fedora} < 44) || (0%{?rhel} && 0%{?rhel} < 11) +Obsoletes: %{name}-compat < 2.5.1-6%{?dist} +%endif +%endif %global _description %{expand: Snoopy is designed to aid a sysadmin by providing a log of commands executed. @@ -37,6 +55,7 @@ Logging is done via syslog.} %description %{_description} +%if %{with compat} %package compat Summary: Compatibility scripts for %{name} @@ -48,14 +67,13 @@ BuildArch: noarch # # per policy we can't mark a package as deprecated on a released # Fedora branch -%if 0%{?fedora} > 38 || 0%{?rhel} Provides: deprecated() -%endif Requires: %{name} = %{version}-%{release} %description compat %{_description} This package contains compatibility scripts for Snoopy. +%endif %prep @@ -65,9 +83,11 @@ This package contains compatibility scripts for Snoopy. %else %autopatch -p1 -M 1100 %endif +%if %{with compat} # compat scripts cp -p %{SOURCE1} . cp -p %{SOURCE2} . +%endif %build @@ -77,9 +97,11 @@ cp -p %{SOURCE2} . %install %make_install +%if %{with compat} for cmd in disable enable; do install -p snoopy-${cmd} %{buildroot}%{_sbindir}/ done +%endif # Get rid of libtool archive file rm %{buildroot}%{_libdir}/libsnoopy.la @@ -97,12 +119,18 @@ rm %{buildroot}%{_libdir}/libsnoopy.la %{_sbindir}/snoopyctl %config(noreplace) %{_sysconfdir}/snoopy.ini +%if %{with compat} %files compat %{_sbindir}/snoopy-disable %{_sbindir}/snoopy-enable +%endif %changelog +* Thu Feb 13 2025 Michel Lind - 2.5.1-6 +- Remove compat subpackage on Fedora >= 42 and EPEL >= 10 +- Create Packit configuration to automate future updates + * Sun Jan 19 2025 Fedora Release Engineering - 2.5.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 9051e8f47aba0173b8f69497d9e20afe46179907 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 13 Feb 2025 22:43:34 +0000 Subject: [PATCH 6/7] Update to 2.5.2 upstream release - Resolves: rhbz#2321673 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 3 +++ snoopy.spec | 8 ++++++-- sources | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 README.packit diff --git a/.gitignore b/.gitignore index 0c1e044..328b48c 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ snoopy-1.7.1.tar.gz /fix-build-for-new-automake.patch /snoopy-2.4.14.tar.gz /snoopy-2.5.1.tar.gz +/snoopy-2.5.2.tar.gz diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..7017e6c --- /dev/null +++ b/README.packit @@ -0,0 +1,3 @@ +This repository is maintained by packit. +https://packit.dev/ +The file was generated using packit 1.1.0.post1.dev2+gf7b527d0. diff --git a/snoopy.spec b/snoopy.spec index 40d0fc8..c727f2d 100644 --- a/snoopy.spec +++ b/snoopy.spec @@ -9,8 +9,8 @@ %endif Name: snoopy -Version: 2.5.1 -Release: 6%{?dist} +Version: 2.5.2 +Release: 1%{?dist} Summary: A preload library to send shell commands to syslog License: GPL-2.0-or-later URL: https://github.com/a2o/snoopy @@ -127,6 +127,10 @@ rm %{buildroot}%{_libdir}/libsnoopy.la %changelog +* Thu Feb 13 2025 Packit - 2.5.2-1 +- Update to version 2.5.2 +- Resolves: rhbz#2321673 + * Thu Feb 13 2025 Michel Lind - 2.5.1-6 - Remove compat subpackage on Fedora >= 42 and EPEL >= 10 - Create Packit configuration to automate future updates diff --git a/sources b/sources index 73dcebb..9f22710 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (snoopy-2.5.1.tar.gz) = 8a09f4603f8ed23ebfd5e79a1e140faff91fdbea32f1698c2945c95d98b19c7503e337963f943b2ed43f33d65a6a107646e3e0f309b32676c5233f32c6289951 +SHA512 (snoopy-2.5.2.tar.gz) = bb16affc545bf02207b6674aebe0821cbe5d70d4b91f873a4a751ef4f7e9a92f4a8d7910020e3c00800754bc5d8d05e9240717d17b7df3004f8a60b988ad4a3a From db47d84b6b61c636ee5074342c4b8ae32559839f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 18:29:37 +0000 Subject: [PATCH 7/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- snoopy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/snoopy.spec b/snoopy.spec index c727f2d..9e743b8 100644 --- a/snoopy.spec +++ b/snoopy.spec @@ -10,7 +10,7 @@ Name: snoopy Version: 2.5.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A preload library to send shell commands to syslog License: GPL-2.0-or-later URL: https://github.com/a2o/snoopy @@ -127,6 +127,9 @@ rm %{buildroot}%{_libdir}/libsnoopy.la %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 2.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Feb 13 2025 Packit - 2.5.2-1 - Update to version 2.5.2 - Resolves: rhbz#2321673