diff --git a/.gitignore b/.gitignore index 328b48c..0c1e044 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,3 @@ 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 deleted file mode 100644 index 7017e6c..0000000 --- a/README.packit +++ /dev/null @@ -1,3 +0,0 @@ -This repository is maintained by packit. -https://packit.dev/ -The file was generated using packit 1.1.0.post1.dev2+gf7b527d0. diff --git a/packit.yaml b/packit.yaml deleted file mode 100644 index fdf84eb..0000000 --- a/packit.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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 9e743b8..5858916 100644 --- a/snoopy.spec +++ b/snoopy.spec @@ -1,16 +1,6 @@ -# 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.2 -Release: 2%{?dist} +Version: 2.5.1 +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 @@ -35,17 +25,9 @@ BuildRequires: %{_bindir}/hostname BuildRequires: %{_bindir}/socat BuildRequires: %{_bindir}/ps -%if %{with compat} -%if 0%{?el8} +%if 0%{?fedora} <= 38 || 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. @@ -55,7 +37,6 @@ Logging is done via syslog.} %description %{_description} -%if %{with compat} %package compat Summary: Compatibility scripts for %{name} @@ -67,13 +48,14 @@ 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 @@ -83,11 +65,9 @@ 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 @@ -97,11 +77,9 @@ 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 @@ -119,37 +97,12 @@ 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 -* 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 - -* 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 - -* 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 - -* 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 diff --git a/sources b/sources index 9f22710..73dcebb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (snoopy-2.5.2.tar.gz) = bb16affc545bf02207b6674aebe0821cbe5d70d4b91f873a4a751ef4f7e9a92f4a8d7910020e3c00800754bc5d8d05e9240717d17b7df3004f8a60b988ad4a3a +SHA512 (snoopy-2.5.1.tar.gz) = 8a09f4603f8ed23ebfd5e79a1e140faff91fdbea32f1698c2945c95d98b19c7503e337963f943b2ed43f33d65a6a107646e3e0f309b32676c5233f32c6289951