diff --git a/xkeycaps.spec b/xkeycaps.spec index dab23c2..7f3cfba 100644 --- a/xkeycaps.spec +++ b/xkeycaps.spec @@ -3,18 +3,18 @@ Name: xkeycaps Summary: Graphical front end to xmodmap Version: 2.46 -Release: 42%{?dist} +Release: 10%{?dist}.3 License: MIT +Group: Applications/System Source0: http://www.jwz.org/xkeycaps/%{name}-%{version}.tar.Z Source1: xkeycaps.desktop Source2: xkeycaps.png URL: http://www.jwz.org/xkeycaps/ -BuildRequires: make -BuildRequires: gcc +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xorg-x11-xbitmaps, libICE-devel, libXmu-devel, libSM-devel BuildRequires: libXaw-devel, imake, libXt-devel, xorg-x11-proto-devel BuildRequires: desktop-file-utils, libXext-devel -Requires: xmodmap +Requires: xorg-x11-server-utils %description xkeycaps is a graphical front-end to xmodmap. It opens a window that @@ -31,125 +31,32 @@ xmodmap to recreate your changes in future sessions. %build xmkmf sed -i -e 's/^\(\s*CFLAGS\s*=.*\)/\1 $(RPM_OPT_FLAGS)/' Makefile -make %{_smp_mflags} +make %install -make DESTDIR=$RPM_BUILD_ROOT install INSTALL="install -p" +rm -rf $RPM_BUILD_ROOT +make DESTDIR=$RPM_BUILD_ROOT install mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 -install -m0644 -p xkeycaps.man $RPM_BUILD_ROOT%{_mandir}/man1 +install -m0644 xkeycaps.man $RPM_BUILD_ROOT%{_mandir}/man1 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps -install -m0644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps -desktop-file-install \ +install -m0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps +desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ %{SOURCE1} +%clean +rm -rf $RPM_BUILD_ROOT + %files +%defattr(-,root,root) %doc README sgi-microsoft.txt %{_bindir}/xkeycaps -%{_datadir}/applications/xkeycaps.desktop +%{_datadir}/applications/fedora-xkeycaps.desktop %{_datadir}/pixmaps/xkeycaps.png %{_mandir}/man1/* %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 2.46-42 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Sat Jan 17 2026 Fedora Release Engineering - 2.46-41 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Jul 25 2025 Fedora Release Engineering - 2.46-40 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Mon Feb 24 2025 Tom Callaway - 2.46-39 -- revert patch to fix cast issues, looks like the dependent library behavior reverted - -* Sun Jan 19 2025 Fedora Release Engineering - 2.46-38 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Sat Jul 20 2024 Fedora Release Engineering - 2.46-37 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Feb 3 2024 Tom Callaway - 2.46-36 -- fix cast issues causing FTBFS - -* Sat Jan 27 2024 Fedora Release Engineering - 2.46-35 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 2.46-34 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 2.46-33 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 2.46-32 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 2.46-31 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 2.46-30 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu Jan 28 2021 Fedora Release Engineering - 2.46-29 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Adam Jackson - 2.46-28 -- Require xmodmap not xorg-x11-server-utils - -* Fri Jan 31 2020 Fedora Release Engineering - 2.46-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 2.46-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 2.46-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 2.46-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Mar 07 2018 Adam Williamson - 2.46-23 -- Rebuild to fix GCC 8 mis-compilation - See https://da.gd/YJVwk ("GCC 8 ABI change on x86_64") - -* Fri Feb 09 2018 Fedora Release Engineering - 2.46-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 2.46-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 2.46-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 2.46-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 2.46-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 2.46-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Aug 18 2014 Fedora Release Engineering - 2.46-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 2.46-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 04 2013 Fedora Release Engineering - 2.46-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Sun Feb 10 2013 Parag Nemade - 2.46-13 -- Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077 -- Cleanup spec as per recently changed packaging guidelines - -* Sun Jul 22 2012 Fedora Release Engineering - 2.46-12.3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 2.46-11.3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - * Mon Feb 07 2011 Fedora Release Engineering - 2.46-10.3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild