diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index e69de29..0000000 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5a3478c --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +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.desktop b/9wm.desktop new file mode 100644 index 0000000..ec11b2f --- /dev/null +++ b/9wm.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=9wm +Comment=This session logs you into 9wm +Exec=/usr/bin/9wm +Type=Application diff --git a/9wm.spec b/9wm.spec new file mode 100644 index 0000000..436623f --- /dev/null +++ b/9wm.spec @@ -0,0 +1,173 @@ +%undefine _annotated_build + +Name: 9wm +Summary: Emulation of the Plan 9 window manager 8 1/2 +Version: 1.4.2 +Release: 7%{?dist} +License: MIT +Source0: https://github.com/9wm/9wm/archive/%{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 +# It needs this to open a terminal. +Requires: xterm + +%description +9wm is an X window manager which attempts to emulate the Plan 9 window +manager 8-1/2 as far as possible within the constraints imposed by X. +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} + +%build +CFLAGS="$RPM_OPT_FLAGS" %make_build + +%install +mkdir -p %{buildroot}%{_bindir} %{buildroot}%{_mandir}/man1 +make DESTDIR=%{buildroot} BIN=%{buildroot}%{_bindir} MANDIR=%{buildroot}%{_mandir}/man1 install install.man +desktop-file-install \ +--dir=${RPM_BUILD_ROOT}%{_datadir}/xsessions/ \ +%{SOURCE1} + +%files +%doc README.md CREDITS.md +%license LICENSE.md +%{_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 + +* Thu Oct 8 2009 Tom "spot" Callaway 1.2-2 +- fix defattr invocation + +* Tue Oct 6 2009 Tom "spot" Callaway 1.2-1 +- Initial package for Fedora diff --git a/9wm_1.2-9.diff b/9wm_1.2-9.diff new file mode 100644 index 0000000..124adaf --- /dev/null +++ b/9wm_1.2-9.diff @@ -0,0 +1,132 @@ +--- 9wm-1.2.orig/menu.c ++++ 9wm-1.2/menu.c +@@ -1,6 +1,8 @@ + /* Copyright (c) 1994-1996 David Hogan, see README for licence details */ ++#include + #include + #include ++#include + #include + #include + #include +@@ -191,7 +193,7 @@ + } + XUnmapWindow(dpy, c->parent); + XUnmapWindow(dpy, c->window); +- setstate(c, IconicState); ++ setwinstate(c, IconicState); + if (c == current) + nofocus(); + hiddenc[numhidden] = c; +@@ -222,7 +224,7 @@ + if (map) { + XMapWindow(dpy, c->window); + XMapRaised(dpy, c->parent); +- setstate(c, NormalState); ++ setwinstate(c, NormalState); + active(c); + top(c); + } +--- 9wm-1.2.orig/manage.c ++++ 9wm-1.2/manage.c +@@ -50,7 +50,7 @@ + + /* Figure out what to do with the window from hints */ + +- if (!getstate(c->window, &state)) ++ if (!getwinstate(c->window, &state)) + state = hints ? hints->initial_state : NormalState; + dohide = (state == IconicState); + +@@ -135,7 +135,7 @@ + active(c); + else + setactive(c, 0); +- setstate(c, NormalState); ++ setwinstate(c, NormalState); + } + if (current && (current != c)) + cmapfocus(current); +@@ -195,7 +195,7 @@ + XReparentWindow(dpy, c->window, c->screen->root, c->x, c->y); + gravitate(c, 0); + XRemoveFromSaveSet(dpy, c->window); +- setstate(c, WithdrawnState); ++ setwinstate(c, WithdrawnState); + + /* flush any errors */ + ignore_badwindow = 1; +@@ -452,7 +452,7 @@ + } + + void +-setstate(c, state) ++setwinstate(c, state) + Client *c; + int state; + { +@@ -467,7 +467,7 @@ + } + + int +-getstate(w, state) ++getwinstate(w, state) + Window w; + int *state; + { +--- 9wm-1.2.orig/client.c ++++ 9wm-1.2/client.c +@@ -1,5 +1,7 @@ + /* Copyright (c) 1994-1996 David Hogan, see README for licence details */ ++#include + #include ++#include + #include + #include + #include +--- 9wm-1.2.orig/main.c ++++ 9wm-1.2/main.c +@@ -1,4 +1,5 @@ + /* Copyright (c) 1994-1996 David Hogan, see README for licence details */ ++#include + #include + #include + #include +--- 9wm-1.2.orig/event.c ++++ 9wm-1.2/event.c +@@ -1,4 +1,5 @@ + /* Copyright (c) 1994-1996 David Hogan, see README for licence details */ ++#include + #include + #include + #include +@@ -200,7 +201,7 @@ + XMapWindow(dpy, c->window); + XMapRaised(dpy, c->parent); + top(c); +- setstate(c, NormalState); ++ setwinstate(c, NormalState); + if (c->trans != None && current && c->trans == current->window) + active(c); + break; +--- 9wm-1.2.orig/error.c ++++ 9wm-1.2/error.c +@@ -1,4 +1,5 @@ + /* Copyright (c) 1994-1996 David Hogan, see README for licence details */ ++#include + #include + #include + #include +--- 9wm-1.2.orig/fns.h ++++ 9wm-1.2/fns.h +@@ -46,8 +46,8 @@ + char *getprop(); + Window getwprop(); + int getiprop(); +-int getstate(); +-void setstate(); ++int getwinstate(); ++void setwinstate(); + void setlabel(); + void getproto(); + void gettrans(); diff --git a/Makefile b/Makefile deleted file mode 100644 index 7c0e3f1..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: 9wm -# $Id$ -NAME := 9wm -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/sources b/sources index e69de29..5eb1108 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +SHA512 (1.4.2.tar.gz) = 4ea27b4a0851519fd1a8ccbd9e4c19addd592a2cd0a5dd1b077661564594b1ceb653cd8ec304ee56654cefa922514a02b041ad3d3639ef43efdb830cdec7485e