rpms/9wm/F-10 9wm.desktop, NONE, 1.1 9wm.spec, NONE, 1.1 9wm_1.2-9.diff, NONE, 1.1 sources, 1.1, 1.2

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/9wm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14905/F-10

Modified Files:
	sources 
Added Files:
	9wm.desktop 9wm.spec 9wm_1.2-9.diff 
Log Message:
initial branching


--- NEW FILE 9wm.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=9wm
Comment=This session logs you into 9wm
Exec=/usr/bin/9wm
Type=Application


--- NEW FILE 9wm.spec ---
Name:		9wm
Summary:	Emulation of the Plan 9 window manager 8 1/2
Version:	1.2
Release:	2%{?dist}
License:	MIT
Group:		User Interface/Desktops
Source0:	http://unauthorised.org/dhog/9wm/pre-9wm-%{version}.tar.gz
Source1:	9wm.desktop
# 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

%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 pre-9wm-%{version}
%patch0 -p1 -b .cleanups

%build
xmkmf
make %{?_smp_mflags} CDEBUGFLAGS="$RPM_OPT_FLAGS"

%install
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
%defattr(-,root,root,-)
%doc README
%{_bindir}/9wm
%{_datadir}/xsessions/9wm.desktop
%{_mandir}/man1/9wm.*

%changelog
* Thu Oct 8 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.2-2
- fix defattr invocation

* Tue Oct 6 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.2-1
- Initial package for Fedora

9wm_1.2-9.diff:
 client.c |    2 ++
 error.c  |    1 +
 event.c  |    3 ++-
 fns.h    |    4 ++--
 main.c   |    1 +
 manage.c |   10 +++++-----
 menu.c   |    6 ++++--
 7 files changed, 17 insertions(+), 10 deletions(-)

--- NEW FILE 9wm_1.2-9.diff ---
--- 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 <stdlib.h>
 #include <stdio.h>
 #include <signal.h>
+#include <unistd.h>
 #include <X11/X.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ -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 <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include <X11/X.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
--- 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 <stdlib.h>
 #include <stdio.h>
 #include <signal.h>
 #include <errno.h>
--- 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 <stdlib.h>
 #include <stdio.h>
 #include <X11/X.h>
 #include <X11/Xos.h>
@@ -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 <stdlib.h>
 #include <stdio.h>
 #include <X11/X.h>
 #include <X11/Xlib.h>
--- 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();


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/9wm/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	4 Nov 2009 21:58:33 -0000	1.1
+++ sources	4 Nov 2009 22:06:20 -0000	1.2
@@ -0,0 +1 @@
+bcd3ea20e49ba9ff90a9fb541861cda5  pre-9wm-1.2.tar.gz