diff --git a/xbindkeys-1.7.3-rplmalloc.patch b/xbindkeys-1.7.3-rplmalloc.patch new file mode 100644 index 0000000..3ac79ad --- /dev/null +++ b/xbindkeys-1.7.3-rplmalloc.patch @@ -0,0 +1,11 @@ +--- ./configure.rplmalloc 2006-07-02 16:21:41.000000000 +0200 ++++ ./configure 2006-07-02 16:22:06.000000000 +0200 +@@ -6191,7 +6191,7 @@ + + + cat >>confdefs.h <<\_ACEOF +-#define malloc rpl_malloc ++/* #define malloc rpl_malloc */ + _ACEOF + + fi diff --git a/xbindkeys-1.8.7-guile-3.0.patch b/xbindkeys-1.8.7-guile-3.0.patch deleted file mode 100644 index 769bf9f..0000000 --- a/xbindkeys-1.8.7-guile-3.0.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- xbindkeys-1.8.7/aclocal.m4.orig 2024-09-30 17:18:49.468471130 +0100 -+++ xbindkeys-1.8.7/aclocal.m4 2024-09-30 17:19:25.084471117 +0100 -@@ -48,7 +48,7 @@ - # - AC_DEFUN([GUILE_PKG], - [PKG_PROG_PKG_CONFIG -- _guile_versions_to_search="m4_default([$1], [2.2 2.0 1.8])" -+ _guile_versions_to_search="m4_default([$1], [3.0 2.2 2.0 1.8])" - if test -n "$GUILE_EFFECTIVE_VERSION"; then - _guile_tmp="" - for v in $_guile_versions_to_search; do ---- xbindkeys-1.8.7/configure.orig 2024-09-30 17:18:58.922471127 +0100 -+++ xbindkeys-1.8.7/configure 2024-09-30 17:19:33.078471114 +0100 -@@ -5395,7 +5395,7 @@ - PKG_CONFIG="" - fi - fi -- _guile_versions_to_search="2.2 2.0 1.8" -+ _guile_versions_to_search="3.0 2.2 2.0 1.8" - if test -n "$GUILE_EFFECTIVE_VERSION"; then - _guile_tmp="" - for v in $_guile_versions_to_search; do diff --git a/xbindkeys.spec b/xbindkeys.spec index 876a315..06e5915 100644 --- a/xbindkeys.spec +++ b/xbindkeys.spec @@ -1,16 +1,14 @@ Name: xbindkeys Version: 1.8.7 -Release: 15%{?dist} +Release: 2%{?dist} Summary: Binds keys or mouse buttons to shell commands under X -# Automatically converted from old format: GPLv2+ - review is highly recommended. -License: GPL-2.0-or-later +License: GPLv2+ URL: http://www.nongnu.org/xbindkeys/ Source: http://www.nongnu.org/xbindkeys/xbindkeys-%{version}.tar.gz -Patch1: xbindkeys-1.8.7-guile-3.0.patch -BuildRequires: make +BuildRequires: make BuildRequires: gcc -BuildRequires: guile30-devel +BuildRequires: guile22-devel BuildRequires: libX11-devel Requires: tk @@ -21,7 +19,7 @@ or mouse buttons using a simple configuration file, and is independent of the window manager. %prep -%autosetup -p1 +%autosetup %build %configure @@ -37,45 +35,6 @@ LDFLAGS="-lpthread" %{make_build} %attr(0644, root, root) %{_mandir}/man?/* %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 1.8.7-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Sat Jan 17 2026 Fedora Release Engineering - 1.8.7-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Jul 25 2025 Fedora Release Engineering - 1.8.7-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Fedora Release Engineering - 1.8.7-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Mon Sep 30 2024 Peter Robinson - 1.8.7-11 -- Build against guile 3.0 - -* Fri Jul 26 2024 Miroslav Suchý - 1.8.7-10 -- convert license to SPDX - -* Sat Jul 20 2024 Fedora Release Engineering - 1.8.7-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 1.8.7-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 1.8.7-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 1.8.7-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 1.8.7-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 1.8.7-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 1.8.7-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - * Wed Jan 27 2021 Fedora Release Engineering - 1.8.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild