From 30ab9700bd0c1c0b399e5a9e95a6580cc253edf0 Mon Sep 17 00:00:00 2001 From: Warren Togami Date: Mon, 23 Apr 2007 16:52:16 +0000 Subject: [PATCH 1/5] Initialize branch FC-6 for windowlab --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..d5b6362 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +FC-6 From b68afa8ab843e9e585e1e261aeabd24655f53efa Mon Sep 17 00:00:00 2001 From: nigelj Date: Tue, 24 Apr 2007 05:28:34 +0000 Subject: [PATCH 2/5] Initial import to FC-6 --- .cvsignore | 1 + sources | 1 + windowlab-1.34-nostrip.patch | 12 ++++++ windowlab-1.34-pathfixes.patch | 21 +++++++++++ windowlab-1.34-xsessions.patch | 27 ++++++++++++++ windowlab.desktop | 6 +++ windowlab.spec | 68 ++++++++++++++++++++++++++++++++++ 7 files changed, 136 insertions(+) create mode 100644 windowlab-1.34-nostrip.patch create mode 100644 windowlab-1.34-pathfixes.patch create mode 100644 windowlab-1.34-xsessions.patch create mode 100644 windowlab.desktop create mode 100644 windowlab.spec diff --git a/.cvsignore b/.cvsignore index e69de29..fd01502 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +windowlab-1.34.tar diff --git a/sources b/sources index e69de29..0681059 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +d566b989f8e59b169f7affa462762c17 windowlab-1.34.tar diff --git a/windowlab-1.34-nostrip.patch b/windowlab-1.34-nostrip.patch new file mode 100644 index 0000000..5a1c368 --- /dev/null +++ b/windowlab-1.34-nostrip.patch @@ -0,0 +1,12 @@ +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 + diff --git a/windowlab-1.34-pathfixes.patch b/windowlab-1.34-pathfixes.patch new file mode 100644 index 0000000..c262985 --- /dev/null +++ b/windowlab-1.34-pathfixes.patch @@ -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 diff --git a/windowlab-1.34-xsessions.patch b/windowlab-1.34-xsessions.patch new file mode 100644 index 0000000..a49442f --- /dev/null +++ b/windowlab-1.34-xsessions.patch @@ -0,0 +1,27 @@ +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 diff --git a/windowlab.desktop b/windowlab.desktop new file mode 100644 index 0000000..d59e8fe --- /dev/null +++ b/windowlab.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=WindowLab +Comment=This session logs you into WindowLab +Exec=/usr/bin/windowlab + diff --git a/windowlab.spec b/windowlab.spec new file mode 100644 index 0000000..0c47b27 --- /dev/null +++ b/windowlab.spec @@ -0,0 +1,68 @@ +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 1.34-4 +- Remove executable bit on source files + +* Wed Apr 18 2007 Nigel Jones 1.34-3 +- Honor $RPM_OPT_FLAGS +- +Patch to prevent stripping of debug info + +* Wed Apr 11 2007 Nigel Jones 1.34-2 +- Minor changes to windowlab-1.34-pathfixes.patch +- Replace files section + +* Tue Apr 10 2007 Nigel Jones 1.34-1 +- Initial SPEC file From 098d6f0e1299ca72f319c41f92a75eeec6b4b832 Mon Sep 17 00:00:00 2001 From: nigelj Date: Wed, 23 May 2007 06:24:49 +0000 Subject: [PATCH 3/5] Move doc section to more appropriate place - no bump --- windowlab.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/windowlab.spec b/windowlab.spec index 0c47b27..095b3a4 100644 --- a/windowlab.spec +++ b/windowlab.spec @@ -43,15 +43,13 @@ 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 -%doc CHANGELOG README TODO LICENCE - - %changelog * Tue Apr 24 2007 Nigel Jones 1.34-4 - Remove executable bit on source files From 1e4727299692ea3c0feaf6beb8139960b67591ed Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:17:07 +0000 Subject: [PATCH 4/5] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a5a6c83..a94edf5 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: windowlab -# $Id$ +# $Id: Makefile,v 1.1 2007/04/23 16:52:00 wtogami Exp $ NAME := windowlab 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 $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +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)) From 89d7b91c1727a1ac803f049c39bce4c8fa681dff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 18:07:58 +0000 Subject: [PATCH 5/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index a94edf5..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: windowlab -# $Id: Makefile,v 1.1 2007/04/23 16:52:00 wtogami Exp $ -NAME := windowlab -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/branch b/branch deleted file mode 100644 index d5b6362..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -FC-6