From eceac09e6298ebeee288a59100b1a83fc8b05140 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 15 May 2007 12:06:53 +0000 Subject: [PATCH 1/6] Initialize branch EL-4 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..6ec5cef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-4 From 15b26a7d99daf6264d6e89028bc2bfbba84f253b Mon Sep 17 00:00:00 2001 From: nigelj Date: Wed, 16 May 2007 06:09:57 +0000 Subject: [PATCH 2/6] Slight fixes for EL-4 --- windowlab.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/windowlab.spec b/windowlab.spec index 0c47b27..89d210a 100644 --- a/windowlab.spec +++ b/windowlab.spec @@ -1,6 +1,6 @@ Name: windowlab Version: 1.34 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Small and Simple Amiga-like Window Manager Group: User Interface/Desktops @@ -13,7 +13,7 @@ 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 +BuildRequires: xorg-x11-devel %description WindowLab is a Window Manager for the X Window System. Features include @@ -24,10 +24,14 @@ incredibly fast and small. %setup -q cp %{SOURCE1} . chmod a-x README TODO LICENCE CHANGELOG *.c *.h + %patch -p1 %patch -P 1 -p1 %patch -P 2 -p1 +# Following sed is a quick hack to tell gcc where to find X11.so etc +sed -i -e 's|LDPATH = -L$(XROOT)/lib|LDPATH = -L$(XROOT)/X11R6/lib|' Makefile + %build CFLAGS=$RPM_OPT_FLAGS make %{?_smp_mflags} @@ -53,6 +57,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 16 2007 Nigel Jones 1.34-5 +- Build for EL-4 (Dependency change) +- + Fix for X11/Xext library paths + * Tue Apr 24 2007 Nigel Jones 1.34-4 - Remove executable bit on source files From f25832b072c42e4453ffd2384a9d2a9c98c3fb2d Mon Sep 17 00:00:00 2001 From: nigelj Date: Wed, 16 May 2007 11:24:11 +0000 Subject: [PATCH 3/6] Bump release + fix LDPATH for x86_64 --- windowlab.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/windowlab.spec b/windowlab.spec index 89d210a..158fa31 100644 --- a/windowlab.spec +++ b/windowlab.spec @@ -1,6 +1,6 @@ Name: windowlab Version: 1.34 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Small and Simple Amiga-like Window Manager Group: User Interface/Desktops @@ -30,7 +30,11 @@ chmod a-x README TODO LICENCE CHANGELOG *.c *.h %patch -P 2 -p1 # Following sed is a quick hack to tell gcc where to find X11.so etc +%ifarch x86_64 +sed -i -e 's|LDPATH = -L$(XROOT)/lib|LDPATH = -L$(XROOT)/X11R6/lib64|' Makefile +%else sed -i -e 's|LDPATH = -L$(XROOT)/lib|LDPATH = -L$(XROOT)/X11R6/lib|' Makefile +%endif %build CFLAGS=$RPM_OPT_FLAGS make %{?_smp_mflags} @@ -57,7 +61,10 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Tue May 16 2007 Nigel Jones 1.34-5 +* Wed May 16 2007 Nigel Jones 1.34-6 +- Fix x86_64 issue for library search dir + +* Wed May 16 2007 Nigel Jones 1.34-5 - Build for EL-4 (Dependency change) - + Fix for X11/Xext library paths From e1e0ff11dc03c82aff8983c1ce01c63819191e30 Mon Sep 17 00:00:00 2001 From: nigelj Date: Wed, 23 May 2007 06:24:30 +0000 Subject: [PATCH 4/6] 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 158fa31..bd13f7b 100644 --- a/windowlab.spec +++ b/windowlab.spec @@ -51,15 +51,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 * Wed May 16 2007 Nigel Jones 1.34-6 - Fix x86_64 issue for library search dir From 4329a151032f29d384a658d62462b821c0c19998 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:17:04 +0000 Subject: [PATCH 5/6] 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 b615eedca8cb898a2631c2875216dd1d87414d5f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 18:07:55 +0000 Subject: [PATCH 6/6] 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 6ec5cef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-4