diff --git a/.gitignore b/.gitignore index f17427d..80b30ac 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ vkeybd-0.1.17a.tar.bz2 /vkeybd-0.1.18d.tar.bz2 +/vkeybd-0.1.18f.tar.gz diff --git a/sources b/sources index ab924d6..e0fb46e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5c7bd16e2903866f949879b885953a2b vkeybd-0.1.18d.tar.bz2 +SHA512 (vkeybd-0.1.18f.tar.gz) = 35525e8e3a0f8781494df7768daafd05466c2ead9f23383bf3fff34451022335fee9b5a0191959f124810d350869480ed5cdc3ea3da1b89567a1af7e1e2960b7 diff --git a/vkeybd-makefile.patch b/vkeybd-makefile.patch new file mode 100644 index 0000000..ef9f7fd --- /dev/null +++ b/vkeybd-makefile.patch @@ -0,0 +1,27 @@ +diff --git a/Makefile b/Makefile +index bd50fcc..a39d73f 100644 +--- a/Makefile ++++ b/Makefile +@@ -27,7 +27,7 @@ VKBLIB_DIR = $(DATA_DIR)/vkeybd + # device selections -- multiple avaialble + # to disable the device, set value 0 (do not comment out!) + # +-USE_AWE = 1 ++USE_AWE = 0 + USE_MIDI = 1 + USE_ALSA = 1 + USE_LASH = 0 +@@ -35,10 +35,10 @@ USE_LASH = 0 + # + # Tcl/Tk library -- depends on your distribution + # +-TCL_VERSION = 8.4 +-TCLLIB = -ltcl$(TCL_VERSION) ++TCL_VERSION = 9.0 ++TCLLIB = -ltcl + TCLINC = +-TKLIB = -ltk$(TCL_VERSION) ++TKLIB = -ltk + TKINC = + XLIB = -L/usr/X11R6/lib -lX11 + XINC = -I/usr/X11R6/include diff --git a/vkeybd-no-OSS.patch b/vkeybd-no-OSS.patch deleted file mode 100644 index 0b896f5..0000000 --- a/vkeybd-no-OSS.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile~ 2007-10-08 14:43:25.000000000 -0700 -+++ Makefile 2007-10-08 14:44:57.000000000 -0700 -@@ -27,7 +27,7 @@ - # device selections -- multiple avaialble - # to disable the device, set value 0 (do not comment out!) - # --USE_AWE = 1 -+USE_AWE = 0 - USE_MIDI = 1 - USE_ALSA = 1 - USE_LASH = 0 diff --git a/vkeybd-tcl8.6.patch b/vkeybd-tcl8.6.patch deleted file mode 100644 index 4fc25fc..0000000 --- a/vkeybd-tcl8.6.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile~ 2008-01-05 06:31:07.000000000 -0500 -+++ Makefile 2008-01-05 06:31:34.000000000 -0500 -@@ -35,7 +35,7 @@ - # - # Tcl/Tk library -- depends on your distribution - # --TCL_VERSION = 8.4 -+TCL_VERSION = 8.6 - TCLLIB = -ltcl$(TCL_VERSION) - TCLINC = - TKLIB = -ltk$(TCL_VERSION) diff --git a/vkeybd.spec b/vkeybd.spec index cee6d6e..bf34883 100644 --- a/vkeybd.spec +++ b/vkeybd.spec @@ -6,25 +6,24 @@ Summary: Virtual MIDI keyboard Name: vkeybd -Version: 0.1.18d -Release: 30%{?dist} +Version: 0.1.18f +Release: 4%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later -URL: http://www.alsa-project.org/~iwai/alsa.html -Source0: http://www.alsa-project.org/~iwai/vkeybd-0.1.18d.tar.bz2 +URL: https://github.com/tiwai/%{name} +Source0: https://github.com/tiwai/%{name}/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: vkeybd.png Source2: vkeybd.desktop -Patch3: vkeybd-no-OSS.patch -Patch4: vkeybd-tcl8.6.patch +Patch0: vkeybd-makefile.patch BuildRequires: make -BuildRequires: gcc -BuildRequires: tk-devel >= 1:8.6, tk-devel < 1:8.7 +BuildRequires: gcc +BuildRequires: tk-devel >= 1:9.0 BuildRequires: lash-devel BuildRequires: desktop-file-utils -Requires: tk >= 1:8.6, tk > 1:8.6, lash +Requires: tk >= 1:9.0 Requires: hicolor-icon-theme %description @@ -33,29 +32,27 @@ It's a simple fake of a MIDI keyboard on X-windows system. Enjoy a music with your mouse and "computer" keyboard :-) %prep -%setup -q -n vkeybd -%patch -P3 -p0 -%patch -P4 -p0 +%autosetup -p1 sed -i -e 's|-Wall -O|$(RPM_OPT_FLAGS)|' Makefile %build -make %{?_smp_mflags} USE_LADCCA=1 TCL_VERSION=8.6 PREFIX=%{_prefix} +%make_build USE_AWE=0 TCL_VERSION=9.0 PREFIX=%{_prefix} %install -make USE_LADCCA=1 PREFIX=%{_prefix} DESTDIR=$RPM_BUILD_ROOT install -make USE_LADCCA=1 PREFIX=%{_prefix} DESTDIR=$RPM_BUILD_ROOT install-man -chmod 644 $RPM_BUILD_ROOT/%{_mandir}/man1/* -chmod 755 $RPM_BUILD_ROOT/%{_datadir}/vkeybd/vkeybd.tcl +%make_install USE_AWE=0 PREFIX=%{_prefix} +%make_install USE_AWE=0 PREFIX=%{_prefix} install-man +chmod 644 %{buildroot}/%{_mandir}/man1/* +chmod 755 %{buildroot}/%{_datadir}/vkeybd/vkeybd.tcl -mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps -install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/vkeybd.png +mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/64x64/apps +install -m 644 %{SOURCE1} %{buildroot}/%{_datadir}/icons/hicolor/64x64/apps/vkeybd.png -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications +mkdir -p %{buildroot}/%{_datadir}/applications desktop-file-install \ %if 0%{?with_desktop_vendor_tag} --vendor fedora \ %endif - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --dir %{buildroot}/%{_datadir}/applications \ --add-category X-Fedora \ %{SOURCE2} @@ -69,6 +66,18 @@ desktop-file-install \ %{_datadir}/icons/hicolor/64x64/apps/vkeybd.png %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 0.1.18f-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Sat Jan 17 2026 Fedora Release Engineering - 0.1.18f-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Fri Jul 25 2025 Fedora Release Engineering - 0.1.18f-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Tue Jun 03 2025 Guido Aulisi - 0.1.18f-1 +- Update to 0.1.18f + * Sun Jan 19 2025 Fedora Release Engineering - 0.1.18d-30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild