diff --git a/.gitignore b/.gitignore index 73aebe4..827d4d7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -/xbindkeys-*.tar.gz +xbindkeys-1.8.3.tar.gz +/xbindkeys-1.8.5.tar.gz diff --git a/sources b/sources index 8a1d3b1..8e71a38 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xbindkeys-1.8.7.tar.gz) = a6b1478e8ef4bedc686fdd15abc11a8a592ac17c69e1a5a13f60e735e9be9646faed62e980cdac4aa7bc7e3253237465de38dee98935dd3f9911d4e48209b2e9 +4b66a05594dbc6888c0a6439351aa66d xbindkeys-1.8.5.tar.gz 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..ac3009b 100644 --- a/xbindkeys.spec +++ b/xbindkeys.spec @@ -1,16 +1,14 @@ Name: xbindkeys -Version: 1.8.7 -Release: 15%{?dist} +Version: 1.8.5 +Release: 5%{?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+ +Group: User Interface/X 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: gcc -BuildRequires: guile30-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: guile-devel BuildRequires: libX11-devel Requires: tk @@ -21,107 +19,26 @@ or mouse buttons using a simple configuration file, and is independent of the window manager. %prep -%autosetup -p1 +%setup -q %build %configure -LDFLAGS="-lpthread" %{make_build} +make %{?_smp_mflags} LDFLAGS="-lpthread" %install -%{make_install} +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT + +%clean +rm -rf $RPM_BUILD_ROOT %files -%license COPYING -%doc AUTHORS INSTALL NEWS README xbindkeysrc* +%defattr(-, root, root) +%doc AUTHORS BUGS ChangeLog COPYING INSTALL NEWS README TODO xbindkeysrc* %attr(0755, root, root) %{_bindir}/xbindkeys* %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 - -* Sun Sep 13 2020 Peter Robinson - 1.8.7-1 -- Update to 1.8.7 -- Use Guile 2.2 - -* Wed Jul 29 2020 Fedora Release Engineering - 1.8.5-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 1.8.5-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 1.8.5-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 1.8.5-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 1.8.5-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 1.8.5-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 1.8.5-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.8.5-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 1.8.5-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 1.8.5-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 1.8.5-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Aug 18 2014 Fedora Release Engineering - 1.8.5-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 1.8.5-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - * Sun Aug 04 2013 Fedora Release Engineering - 1.8.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild