From 2693315b492099a1b90f316f3ef8e8b2b4b7c3c4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 18:07:57 +0000 Subject: [PATCH 1/2] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile 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) From 659b93da47b80ede3528cecabb0b7a7f15248aa4 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 27 Aug 2010 15:15:32 -0400 Subject: [PATCH 2/2] Retire windowlab. --- dead.package | 1 + sources | 1 - windowlab-1.34-pathfixes.patch | 21 --------- windowlab-1.37-nostrip.patch | 12 ------ windowlab-1.37-xsessions.patch | 26 ----------- windowlab.desktop | 6 --- windowlab.spec | 79 ---------------------------------- 7 files changed, 1 insertion(+), 145 deletions(-) create mode 100644 dead.package delete mode 100644 sources delete mode 100644 windowlab-1.34-pathfixes.patch delete mode 100644 windowlab-1.37-nostrip.patch delete mode 100644 windowlab-1.37-xsessions.patch delete mode 100644 windowlab.desktop delete mode 100644 windowlab.spec diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..7dcad86 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +This package was retired due to no active owner on 2010-08-27 diff --git a/sources b/sources deleted file mode 100644 index 5a91f0a..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -77e1552de99146a29ff405f2fdae47e4 windowlab-1.37.tar diff --git a/windowlab-1.34-pathfixes.patch b/windowlab-1.34-pathfixes.patch deleted file mode 100644 index c262985..0000000 --- a/windowlab-1.34-pathfixes.patch +++ /dev/null @@ -1,21 +0,0 @@ -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.37-nostrip.patch b/windowlab-1.37-nostrip.patch deleted file mode 100644 index ed5ed01..0000000 --- a/windowlab-1.37-nostrip.patch +++ /dev/null @@ -1,12 +0,0 @@ -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) diff --git a/windowlab-1.37-xsessions.patch b/windowlab-1.37-xsessions.patch deleted file mode 100644 index 74ee04a..0000000 --- a/windowlab-1.37-xsessions.patch +++ /dev/null @@ -1,26 +0,0 @@ -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) diff --git a/windowlab.desktop b/windowlab.desktop deleted file mode 100644 index d59e8fe..0000000 --- a/windowlab.desktop +++ /dev/null @@ -1,6 +0,0 @@ -[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 deleted file mode 100644 index 2cffaa6..0000000 --- a/windowlab.spec +++ /dev/null @@ -1,79 +0,0 @@ -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 - 1.37-1 -- licensing problems are resolved -- updating to 1.37 - -* Tue Feb 19 2008 Fedora Release Engineering - 1.34-5 -- Autorebuild for GCC 4.3 - -* 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