dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: windowlab
-# $Id$
-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
-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)

windowlab.spec

@@ -1,6 +1,6 @@
 Name:           windowlab
 Version:        1.34
-Release:        4%{?dist}
+Release:        6%{?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,18 @@ 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
+%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}
 
@@ -43,16 +51,21 @@ 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 <dev@nigelj.com> 1.34-6
+- Fix x86_64 issue for library search dir
+
+* Wed May 16 2007 Nigel Jones <dev@nigelj.com> 1.34-5
+- Build for EL-4 (Dependency change)
+- + Fix for X11/Xext library paths
+
 * Tue Apr 24 2007 Nigel Jones <dev@nigelj.com> 1.34-4
 - Remove executable bit on source files