rpms/windowlab/FC-6 windowlab-1.34-nostrip.patch, NONE, 1.1 windowlab-1.34-pathfixes.patch, NONE, 1.1 windowlab-1.34-xsessions.patch, NONE, 1.1 windowlab.desktop, NONE, 1.1 windowlab.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Nigel Jones (nigelj)]

Author: nigelj

Update of /cvs/extras/rpms/windowlab/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8515/FC-6

Modified Files:
	.cvsignore sources 
Added Files:
	windowlab-1.34-nostrip.patch windowlab-1.34-pathfixes.patch 
	windowlab-1.34-xsessions.patch windowlab.desktop 
	windowlab.spec 
Log Message:
Initial import to FC-6


windowlab-1.34-nostrip.patch:

--- NEW FILE windowlab-1.34-nostrip.patch ---
diff -u windowlab-1.34.old/Makefile windowlab-1.34/Makefile
--- windowlab-1.34.old/Makefile	2006-08-14 05:27:52.000000000 +1200
+++ windowlab-1.34/Makefile	2007-04-17 22:41:38.000000000 +1200
@@ -60,7 +60,7 @@
 	$(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) -c $< -o $@
 
 install: all
-	mkdir -p $(BINDIR) && install -m 755 -s $(PROG) $(BINDIR)
+	mkdir -p $(BINDIR) && install -m 755 $(PROG) $(BINDIR)
 	mkdir -p $(MANDIR) && install -m 644 $(MANPAGE) $(MANDIR) && gzip -9vfn $(MANDIR)/$(MANPAGE)
 	mkdir -p $(CFGDIR) && cp -i windowlab.menurc $(CFGDIR)/windowlab.menurc && chmod 644 $(CFGDIR)/windowlab.menurc
 

windowlab-1.34-pathfixes.patch:

--- NEW FILE windowlab-1.34-pathfixes.patch ---
diff -u windowlab-1.34.old/Makefile windowlab-1.34/Makefile
--- windowlab-1.34.old/Makefile	2007-04-11 09:32:40.000000000 +1200
+++ windowlab-1.34/Makefile	2007-04-11 09:37:42.000000000 +1200
@@ -8,7 +8,7 @@
 PREFIX =
 
 # Set this to the location of the X installation you want to compile against
-XROOT = /usr/X11R6
+XROOT = /usr
 
 # Set this to the location of the global configuration files
 SYSCONFDIR = $(PREFIX)/etc/X11/windowlab
@@ -40,7 +40,7 @@
 endif
 
 BINDIR = $(DESTDIR)$(PREFIX)$(XROOT)/bin
-MANDIR = $(DESTDIR)$(PREFIX)$(XROOT)/man/man1
+MANDIR = $(DESTDIR)$(PREFIX)$(XROOT)/share/man/man1
 CFGDIR = $(DESTDIR)$(SYSCONFDIR)
 INCLUDES = -I$(XROOT)/include $(EXTRA_INC)
 LDPATH = -L$(XROOT)/lib

windowlab-1.34-xsessions.patch:

--- NEW FILE windowlab-1.34-xsessions.patch ---
diff -u windowlab-1.34.old/Makefile windowlab-1.34/Makefile
--- windowlab-1.34.old/Makefile	2007-04-10 09:21:45.000000000 +1200
+++ windowlab-1.34/Makefile	2007-04-10 09:58:28.000000000 +1200
@@ -42,12 +42,14 @@
 BINDIR = $(DESTDIR)$(PREFIX)$(XROOT)/bin
 MANDIR = $(DESTDIR)$(PREFIX)$(XROOT)/man/man1
 CFGDIR = $(DESTDIR)$(SYSCONFDIR)
+XSESSDIR = $(DESTDIR)$(PREFIX)/usr/share/xsessions
 INCLUDES = -I$(XROOT)/include $(EXTRA_INC)
 LDPATH = -L$(XROOT)/lib
 LIBS = -lX11 $(EXTRA_LIBS)
 
 PROG = windowlab
 MANPAGE = windowlab.1x
+XSESSFILE = windowlab.desktop
 OBJS = main.o events.o client.o new.o manage.o misc.o taskbar.o menufile.o
 HEADERS = windowlab.h
 
@@ -63,6 +65,7 @@
 	mkdir -p $(BINDIR) && install -m 755 -s $(PROG) $(BINDIR)
 	mkdir -p $(MANDIR) && install -m 644 $(MANPAGE) $(MANDIR) && gzip -9vfn $(MANDIR)/$(MANPAGE)
 	mkdir -p $(CFGDIR) && cp -i windowlab.menurc $(CFGDIR)/windowlab.menurc && chmod 644 $(CFGDIR)/windowlab.menurc
+	mkdir -p $(XSESSDIR) && install -m 644 $(XSESSFILE) $(XSESSDIR)
 
 clean:
 	rm -f $(PROG) $(OBJS)
Only in windowlab-1.34: windowlab.desktop


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



--- NEW FILE windowlab.spec ---
Name:           windowlab
Version:        1.34
Release:        4%{?dist}
Summary:        Small and Simple Amiga-like Window Manager

Group:          User Interface/Desktops
License:        GPL
URL:            http://nickgravgaard.com/windowlab/
Source0:        http://nickgravgaard.com/windowlab/windowlab-1.34.tar
Source1:        windowlab.desktop
Patch0:         windowlab-1.34-pathfixes.patch
Patch1:         windowlab-1.34-xsessions.patch
Patch2:         windowlab-1.34-nostrip.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libX11-devel libXext-devel

%description
WindowLab is a Window Manager for the X Window System. Features include
click-to-focus and a simple menu/taskbar combination. WindowLab is 
incredibly fast and small.

%prep
%setup -q 
cp %{SOURCE1} .
chmod a-x README TODO LICENCE CHANGELOG *.c *.h
%patch -p1
%patch -P 1 -p1
%patch -P 2 -p1

%build
CFLAGS=$RPM_OPT_FLAGS make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%dir %{_sysconfdir}/X11/windowlab/
%config(noreplace) %{_sysconfdir}/X11/windowlab/windowlab.menurc
%{_bindir}/windowlab
%{_mandir}/man1/windowlab.1x.gz
%{_datadir}/xsessions/windowlab.desktop

%doc CHANGELOG README TODO LICENCE


%changelog
* Tue Apr 24 2007 Nigel Jones <dev at nigelj.com> 1.34-4
- Remove executable bit on source files

* Wed Apr 18 2007 Nigel Jones <dev at nigelj.com> 1.34-3
- Honor $RPM_OPT_FLAGS
- +Patch to prevent stripping of debug info

* Wed Apr 11 2007 Nigel Jones <dev at nigelj.com> 1.34-2
- Minor changes to windowlab-1.34-pathfixes.patch
- Replace files section

* Tue Apr 10 2007 Nigel Jones <dev at nigelj.com> 1.34-1
- Initial SPEC file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/windowlab/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2007 16:52:00 -0000	1.1
+++ .cvsignore	24 Apr 2007 05:28:34 -0000	1.2
@@ -0,0 +1 @@
+windowlab-1.34.tar


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/windowlab/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2007 16:52:00 -0000	1.1
+++ sources	24 Apr 2007 05:28:34 -0000	1.2
@@ -0,0 +1 @@
+d566b989f8e59b169f7affa462762c17  windowlab-1.34.tar