rpms/windowlab/devel sources, 1.3, 1.4 windowlab-1.34-pathfixes.patch, 1.2, 1.3 windowlab-1.37-nostrip.patch, NONE, 1.1 windowlab-1.37-xsessions.patch, NONE, 1.1 windowlab.desktop, 1.2, 1.3 windowlab.spec, 1.3, 1.4 .cvsignore, 1.2, 1.3 dead.package, 1.2, NONE

Tue Oct 6 19:07:55 UTC 2009

Author: spot

Update of /cvs/pkgs/rpms/windowlab/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17281/devel

Modified Files:
	.cvsignore 
Added Files:
	sources windowlab-1.34-pathfixes.patch 
	windowlab-1.37-nostrip.patch windowlab-1.37-xsessions.patch 
	windowlab.desktop windowlab.spec 
Removed Files:
	dead.package 
Log Message:
revive


Index: sources
===================================================================
RCS file: sources
diff -N sources

--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	6 Oct 2009 19:07:51 -0000	1.4
@@ -0,0 +1 @@
+77e1552de99146a29ff405f2fdae47e4  windowlab-1.37.tar

windowlab-1.34-pathfixes.patch:
 Makefile |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: windowlab-1.34-pathfixes.patch
===================================================================
RCS file: windowlab-1.34-pathfixes.patch
diff -N windowlab-1.34-pathfixes.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ windowlab-1.34-pathfixes.patch	6 Oct 2009 19:07:51 -0000	1.3
@@ -0,0 +1,21 @@
+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.37-nostrip.patch:
 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE windowlab-1.37-nostrip.patch ---
diff -up windowlab-1.37/Makefile.nostrip windowlab-1.37/Makefile
--- windowlab-1.37/Makefile.nostrip	2009-10-06 14:54:18.715418110 -0400
+++ windowlab-1.37/Makefile	2009-10-06 14:54:52.434312963 -0400
@@ -61,7 +61,7 @@ $(OBJS): %.o: %.c $(HEADERS)
 	$(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
 	mkdir -p $(XSESSDIR) && install -m 644 $(XSESSFILE) $(XSESSDIR)

windowlab-1.37-xsessions.patch:
 Makefile |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE windowlab-1.37-xsessions.patch ---
diff -up windowlab-1.37/Makefile.xsessions windowlab-1.37/Makefile
--- windowlab-1.37/Makefile.xsessions	2009-10-06 14:57:32.318292710 -0400
+++ windowlab-1.37/Makefile	2009-10-06 14:57:59.255300192 -0400
@@ -42,12 +42,14 @@ endif
 BINDIR = $(DESTDIR)$(PREFIX)$(XROOT)/bin
 MANDIR = $(DESTDIR)$(PREFIX)$(XROOT)/share/man/man1
 CFGDIR = $(DESTDIR)$(SYSCONFDIR)
+XSESSDIR = $(DESTDIR)$(PREFIX)$(XROOT)/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 @@ install: all
 	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)


Index: windowlab.desktop
===================================================================
RCS file: windowlab.desktop
diff -N windowlab.desktop
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ windowlab.desktop	6 Oct 2009 19:07:52 -0000	1.3
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=WindowLab
+Comment=This session logs you into WindowLab
+Exec=/usr/bin/windowlab
+


Index: windowlab.spec
===================================================================
RCS file: windowlab.spec
diff -N windowlab.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ windowlab.spec	6 Oct 2009 19:07:52 -0000	1.4
@@ -0,0 +1,79 @@
+Name:           windowlab
+Version:        1.37
+Release:        1%{?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-%{version}.tar
+Source1:        windowlab.desktop
+Patch0:         windowlab-1.34-pathfixes.patch
+Patch1:         windowlab-1.37-xsessions.patch
+Patch2:         windowlab-1.37-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
+
+for i in CHANGELOG README; do
+  iconv -f iso-8859-1 -t utf-8 -o $i{.utf8,}
+  mv $i{.utf8,}
+done
+
+%patch0 -p1 -b .pathfixes
+%patch1 -p1 -b .xsessions
+%patch2 -p1 -b .nostrip
+
+%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,-)
+%doc CHANGELOG README TODO LICENCE
+%dir %{_sysconfdir}/X11/windowlab/
+%config(noreplace) %{_sysconfdir}/X11/windowlab/windowlab.menurc
+%{_bindir}/windowlab
+%{_mandir}/man1/windowlab.1x.gz
+%{_datadir}/xsessions/windowlab.desktop
+
+%changelog
+* Tue Oct  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.37-1
+- licensing problems are resolved
+- updating to 1.37
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.34-5
+- Autorebuild for GCC 4.3
+
+* 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/pkgs/rpms/windowlab/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	24 Apr 2007 05:06:12 -0000	1.2
+++ .cvsignore	6 Oct 2009 19:07:51 -0000	1.3
@@ -1 +1,2 @@
 windowlab-1.34.tar
+windowlab-1.37.tar


--- dead.package DELETED ---


