diff --git a/.gitignore b/.gitignore index 5a3478c..1bbfef7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1 @@ pre-9wm-1.2.tar.gz -/9wm-1.3.2.tar.gz -/9wm-1.3.3.tar.gz -/9wm-1.3.4.tar.gz -/9wm-1.3.5.tar.gz -/1.3.7.tar.gz -/1.4.0.tar.gz -/1.4.1.tar.gz -/1.4.2.tar.gz diff --git a/9wm.spec b/9wm.spec index 436623f..1b20d39 100644 --- a/9wm.spec +++ b/9wm.spec @@ -1,16 +1,16 @@ -%undefine _annotated_build - Name: 9wm Summary: Emulation of the Plan 9 window manager 8 1/2 -Version: 1.4.2 -Release: 7%{?dist} +Version: 1.2 +Release: 3%{?dist} License: MIT -Source0: https://github.com/9wm/9wm/archive/%{version}.tar.gz +Group: User Interface/Desktops +Source0: http://unauthorised.org/dhog/9wm/pre-9wm-%{version}.tar.gz Source1: 9wm.desktop -URL: https://woozle.org/neale/src/9wm/ -BuildRequires: gcc -BuildRequires: libXext-devel, libX11-devel, desktop-file-utils -BuildRequires: make +# Patch from Debian, minor cleanups +Patch0: 9wm_1.2-9.diff +URL: http://unauthorised.org/dhog/9wm.html +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: imake, libXext-devel, libX11-devel, desktop-file-utils # It needs this to open a terminal. Requires: xterm @@ -21,148 +21,31 @@ It provides a simple yet comfortable user interface, without garish decorations or title-bars. Or icons. And it's click-to-type. %prep -%setup -q -n 9wm-%{version} +%setup -q -n pre-9wm-%{version} +%patch0 -p1 -b .cleanups %build -CFLAGS="$RPM_OPT_FLAGS" %make_build +xmkmf +make %{?_smp_mflags} CDEBUGFLAGS="$RPM_OPT_FLAGS" %install -mkdir -p %{buildroot}%{_bindir} %{buildroot}%{_mandir}/man1 -make DESTDIR=%{buildroot} BIN=%{buildroot}%{_bindir} MANDIR=%{buildroot}%{_mandir}/man1 install install.man +rm -rf $RPM_BUILD_ROOT +make DESTDIR=$RPM_BUILD_ROOT install install.man desktop-file-install \ --dir=${RPM_BUILD_ROOT}%{_datadir}/xsessions/ \ %{SOURCE1} +%clean +rm -rf $RPM_BUILD_ROOT + %files -%doc README.md CREDITS.md -%license LICENSE.md +%defattr(-,root,root,-) +%doc README %{_bindir}/9wm %{_datadir}/xsessions/9wm.desktop %{_mandir}/man1/9wm.* %changelog -* Fri Jan 16 2026 Fedora Release Engineering - 1.4.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Wed Jul 23 2025 Fedora Release Engineering - 1.4.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Fri Feb 21 2025 Tom Callaway - 1.4.2-5 -- do not override 9wm's default CFLAGS (while preserving Fedora's optflags) - Thanks to Jacob Adams. - -* Mon Jan 20 2025 Fedora Release Engineering - 1.4.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Thu Jan 16 2025 Fedora Release Engineering - 1.4.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Jul 17 2024 Fedora Release Engineering - 1.4.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Wed Jan 24 2024 Tom Callaway - 1.4.2-1 -- update to 1.4.2 - -* Mon Jan 22 2024 Fedora Release Engineering - 1.4.1-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 1.4.1-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Jan 18 2024 Fedora Release Engineering - 1.4.1-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jul 19 2023 Fedora Release Engineering - 1.4.1-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Jan 18 2023 Fedora Release Engineering - 1.4.1-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Jul 20 2022 Fedora Release Engineering - 1.4.1-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed Jan 19 2022 Fedora Release Engineering - 1.4.1-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 1.4.1-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon Jan 25 2021 Fedora Release Engineering - 1.4.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 1.4.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 13 2020 Tom Stellard - 1.4.1-6 -- Use make macros -- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro - -* Tue Jan 28 2020 Fedora Release Engineering - 1.4.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Jul 24 2019 Fedora Release Engineering - 1.4.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 1.4.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 12 2018 Fedora Release Engineering - 1.4.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Apr 10 2018 Tom Callaway - 1.4.1-1 -- update to 1.4.1 - -* Wed Feb 07 2018 Fedora Release Engineering - 1.4.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Aug 02 2017 Fedora Release Engineering - 1.4.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1.4.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Mon May 15 2017 Tom Callaway - 1.4.0-1 -- update to 1.4.0 - -* Sun Mar 26 2017 Tom Callaway - 1.3.7-1 -- update to 1.3.7 - -* Fri Feb 10 2017 Fedora Release Engineering - 1.3.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Feb 03 2016 Fedora Release Engineering - 1.3.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jan 27 2016 Tom Callaway - 1.3.5-1 -- update to 1.3.5 - -* Tue Nov 17 2015 Tom Callaway - 1.3.4-1 -- update to 1.3.4 - -* Thu Oct 29 2015 Tom Callaway - 1.3.2-1 -- update to 1.3.2 - -* Tue Jun 16 2015 Fedora Release Engineering - 1.2-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri Aug 15 2014 Fedora Release Engineering - 1.2-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Fri Jun 06 2014 Fedora Release Engineering - 1.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri Aug 02 2013 Fedora Release Engineering - 1.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Feb 13 2013 Fedora Release Engineering - 1.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Jul 18 2012 Fedora Release Engineering - 1.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Jan 12 2012 Fedora Release Engineering - 1.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - * Mon Feb 07 2011 Fedora Release Engineering - 1.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 5eb1108..c29719d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (1.4.2.tar.gz) = 4ea27b4a0851519fd1a8ccbd9e4c19addd592a2cd0a5dd1b077661564594b1ceb653cd8ec304ee56654cefa922514a02b041ad3d3639ef43efdb830cdec7485e +bcd3ea20e49ba9ff90a9fb541861cda5 pre-9wm-1.2.tar.gz