- up to 4.2.1 (rel 0.9)

- works for me on a 32bit athlon
- dropped old patches (-fPIC merged upstream, alpha is out of my reach)

Changed files:
    plt-alpha.patch -> 1.2
    plt-pic.patch -> 1.2
    plt.spec -> 1.22

3 files changed, 125 insertions, 142 deletions

diff --git a/plt-alpha.patch b/plt-alpha.patch
deleted file mode 100644
index c052680..0000000
--- a/plt-alpha.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- plt/src/mzscheme/configure.in.orig	2004-07-22 10:21:19.000000000 +0200
-+++ plt/src/mzscheme/configure.in	2005-05-12 19:47:59.000000000 +0200
-@@ -369,7 +369,7 @@
-        fi
-        ;;
-       alpha)
--       EXTRA_GMP_OBJ="gmp_alpha_gcc.o"
-+       EXTRA_GMP_OBJ="gmp_alpha_gcc.lo"
-        ;;
-       *)
-        ;;
---- plt/src/mzscheme/src/Makefile.in.orig	2003-06-21 01:04:41.000000000 +0200
-+++ plt/src/mzscheme/src/Makefile.in	2005-05-12 20:21:54.000000000 +0200
-@@ -216,7 +216,7 @@
- 	$(CC) $(CFLAGS) -c $(srcdir)/vector.c -o vector.@LTO@
- 
- gmp_alpha_gcc.@LTO@: $(srcdir)/gmp/gmp_alpha_gcc.s
--	$(AS) -o gmp_alpha_gcc.@LTO@ $(srcdir)/gmp/gmp_alpha_gcc.s
-+	$(CC) --tag=CC -o gmp_alpha_gcc.@LTO@ -c $(srcdir)/gmp/gmp_alpha_gcc.s
- 
- SCONFIG =   $(srcdir)/../sconfig.h $(srcdir)/../uconfig.h
- 
diff --git a/plt-pic.patch b/plt-pic.patch
deleted file mode 100644
index c71be27..0000000
--- a/plt-pic.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- plt/src/mzscheme/dynsrc/Makefile.in.orig	2003-09-29 15:48:24.000000000 +0200
-+++ plt/src/mzscheme/dynsrc/Makefile.in	2005-05-11 19:27:36.000000000 +0200
-@@ -32,20 +32,20 @@
- MZDYNDEP = ../mzdyn.o $(srcdir)/../include/ext.exp $(srcdir)/../include/mzscheme.exp
- 
- ../mzdyn.o: $(srcdir)/mzdyn.c $(srcdir)/../src/schvers.h  $(HEADERS)
--	$(PLAIN_CC) $(CFLAGS) -c $(srcdir)/mzdyn.c -o ../mzdyn.o
-+	$(PLAIN_CC) $(CFLAGS) -fPIC -c $(srcdir)/mzdyn.c -o ../mzdyn.o
- 
- ../mzdyn3m.o: $(srcdir)/mzdyn.c $(srcdir)/../src/schvers.h  $(HEADERS)
--	$(PLAIN_CC) $(CFLAGS) -DMZ_PRECISE_GC -c $(srcdir)/mzdyn.c -o ../mzdyn3m.o
-+	$(PLAIN_CC) $(CFLAGS) -fPIC -DMZ_PRECISE_GC -c $(srcdir)/mzdyn.c -o ../mzdyn3m.o
- 
- ../dynexmpl.so: dynexmpl.o $(MZDYNDEP)
- 	$(DYNLINK) ../dynexmpl.so dynexmpl.o
- dynexmpl.o: $(srcdir)/dynexmpl.c  $(HEADERS)
--	$(PLAIN_CC) $(CFLAGS) -c $(srcdir)/dynexmpl.c -o dynexmpl.o
-+	$(PLAIN_CC) $(CFLAGS) -fPIC -c $(srcdir)/dynexmpl.c -o dynexmpl.o
- 
- ../oe.so: oe.o  $(MZDYNDEP)
- 	$(DYNLINK) ../oe.so oe.o
- oe.o: $(srcdir)/oe.c $(HEADERS)
--	$(PLAIN_CC) $(CFLAGS) -c $(srcdir)/oe.c -o oe.o
-+	$(PLAIN_CC) $(CFLAGS) -fPIC -c $(srcdir)/oe.c -o oe.o
- 
- ILIBDIR = $(prefix)/lib
- 
diff --git a/plt.spec b/plt.spec
index 6cad07c..6748bed 100644
--- a/plt.spec
+++ b/plt.spec
@@ -1,19 +1,21 @@
+#
+# TODO:
+# - lib64 patch still needed?
+#
 Summary:	PLT Scheme programming environment
 Summary(pl.UTF-8):	Środowisko programistyczne PLT Scheme
 Name:		plt
-Version:	208
-Release:	2
+Version:	4.2.1
+Release:	0.9
 License:	LGPL
 Group:		Development/Languages
 Source0:	http://download.plt-scheme.org/bundles/%{version}/plt/%{name}-%{version}-src-unix.tgz
-# Source0-md5:	0036e215d9402f7755b23cc875090f9e
-#Patch0:		%{name}-install.patch
-Patch0:		%{name}-pic.patch
-Patch1:		%{name}-alpha.patch
-Patch2:		%{name}-lib64.patch
+# Source0-md5:	d448aa8b579682687a8748100a901274
+#Patch0:		%{name}-lib64.patch
 URL:		http://www.drscheme.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
+BuildRequires:	cairo-devel
 BuildRequires:	expat-devel
 BuildRequires:	fontconfig-devel
 BuildRequires:	freetype-devel
@@ -22,6 +24,13 @@ BuildRequires:	libpng-devel
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool
 BuildRequires:	openssl-devel
+BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	xorg-lib-libXaw-devel
+BuildRequires:	xorg-lib-libXext-devel
+BuildRequires:	xorg-lib-libXft-devel
+BuildRequires:	xorg-lib-libXmu-devel
+BuildRequires:	xorg-lib-libXrender-devel
+BuildRequires:	xorg-lib-libXt-devel
 BuildRequires:	zlib-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -89,17 +98,16 @@ This package contains sample games from PLT Scheme project.
 %description games -l pl.UTF-8
 Pakiet zawiera przykładowe gry z projektu PLT Scheme.
 
-%package help-desk
-Summary:	Help desk for PLT Scheme
-Summary(pl.UTF-8):	Pomoc dla PLT Scheme
+%package docs
+Summary:	Documentation for PLT Scheme
+Summary(pl.UTF-8):	Dokumentacja dla PLT Scheme
 Group:		Documentation
-Requires:	%{name}-mred = %{version}-%{release}
 
-%description help-desk
-Help desk for PLT Scheme.
+%description docs
+Documentation for PLT Scheme.
 
-%description help-desk -l pl.UTF-8
-Pakiet zawiera graficzną pomoc dla PLT Scheme.
+%description docs -l pl.UTF-8
+Pakiet zawiera dokumentację dla PLT Scheme.
 
 %package slideshow
 Summary:	Slideshow from PLT Scheme
@@ -115,9 +123,8 @@ Pokaz slajdów z PLT Scheme.
 
 %package webserver
 Summary:	Webserver from PLT Scheme
-Summary(pl.UTF-8):	Serwer WEB z PLT Scheme
+Summary(pl.UTF-8):	Serwer WWW z PLT Scheme
 Group:		Applications/WWW
-Requires:	%{name}-mred = %{version}-%{release}
 
 %description webserver
 Webserver from PLT Scheme.
@@ -140,21 +147,18 @@ Pakiet zawiera linki symboliczne, pliki nagłówkowe i biblioteki
 niezbędne do kompilacji i inkowania programów wykorzystujących PLT.
 
 %prep
-%setup -q -n %{name}
-%patch0 -p1
-%patch1 -p1
-%if "%{_lib}" == "lib64"
-%patch2 -p1
-%endif
+%setup -q -n %{name}-%{version}
+#if "%{_lib}" == "lib64"
+#patch0 -p1
+#endif
 
 %build
-cd src/lt
+cd src/mzscheme
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 cd ..
-ln -sf mzscheme/configure.in .
-%{__autoconf}
+ln -sf mzscheme/configure .
 %configure \
 	--enable-shared
 %{__make}
@@ -163,104 +167,128 @@ ln -sf mzscheme/configure.in .
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir},%{_includedir},%{_libdir}/%{name}}
 
-export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
 %{__make} -C src install \
-	prefix=$RPM_BUILD_ROOT%{_prefix}
-
-mv $RPM_BUILD_ROOT%{_prefix}/{collects,teachpack} $RPM_BUILD_ROOT%{_libdir}/%{name}
-mv $RPM_BUILD_ROOT%{_prefix}/man/man1 $RPM_BUILD_ROOT%{_mandir}
-
-#temporary
-ln -sf $RPM_BUILD_ROOT{%{_bindir},%{_includedir}} $RPM_BUILD_ROOT%{_libdir}/%{name}
-ln -sf $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_libdir}/%{name}/%{_lib}
-
-# emulate setup procedure
-export PLTHOME=$RPM_BUILD_ROOT%{_libdir}/%{name}
-cd $RPM_BUILD_ROOT%{_libdir}/%{name}
-bin/mzscheme -qe "(dynamic-require '(lib \"setup.ss\" \"setup\") #f)"
-cd -
-for script in drscheme help-desk mzc setup-plt tex2page mzpp games mztext pdf-slatex slatex slideshow web* framework*; do
-	perl -pi -e "s|PLTHOME=\"$RPM_BUILD_ROOT%{_libdir}/%{name}\"|PLTHOME=\"%{_libdir}/%{name}\"|" \
-		$RPM_BUILD_ROOT%{_bindir}/$script
-done
-for file in `find $RPM_BUILD_ROOT%{_libdir}/%{name}/collects -name *.dep`; do
-	perl -pi -e 's|'$RPM_BUILD_ROOT'||' $file
-done
-
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/{bin,%{_lib},include}
-ln -sf %{_bindir} %{_includedir}  $RPM_BUILD_ROOT%{_libdir}/%{name}
-ln -sf %{_libdir} $RPM_BUILD_ROOT%{_libdir}/%{name}/%{_lib}
-
-mv notes/teachpack/HISTORY teachpack.history
+	DESTDIR=$RPM_BUILD_ROOT
+
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/collects/{mysterx,mzcom}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files mzscheme
 %defattr(644,root,root,755)
-%doc notes/mzscheme/*
-%doc notes/stepper
-%attr(755,root,root) %{_bindir}/mzscheme
+%doc doc/release-notes/{mzscheme,redex,stepper}
 %attr(755,root,root) %{_bindir}/mzc
 %attr(755,root,root) %{_bindir}/mzpp
+%attr(755,root,root) %{_bindir}/mzscheme
 %attr(755,root,root) %{_bindir}/mztext
 %attr(755,root,root) %{_bindir}/pdf-slatex
-%attr(755,root,root) %{_bindir}/slatex
+%attr(755,root,root) %{_bindir}/planet
+%attr(755,root,root) %{_bindir}/plt-r5rs
+%attr(755,root,root) %{_bindir}/plt-r6rs
+%attr(755,root,root) %{_bindir}/scribble
 %attr(755,root,root) %{_bindir}/setup-plt
+%attr(755,root,root) %{_bindir}/slatex
+%attr(755,root,root) %{_bindir}/swindle
 %attr(755,root,root) %{_bindir}/tex2page
 
 %dir %{_libdir}/%{name}
+%attr(755,root,root) %{_libdir}/%{name}/starter
+%{_libdir}/%{name}/buildinfo
 %dir %{_libdir}/%{name}/collects
-%{_libdir}/%{name}/collects/xml
-%{_libdir}/%{name}/collects/version
-%{_libdir}/%{name}/collects/t*
+%{_libdir}/%{name}/collects/2htdp
+%{_libdir}/%{name}/collects/afm
+%{_libdir}/%{name}/collects/algol60
+%{_libdir}/%{name}/collects/at-exp
+%{_libdir}/%{name}/collects/browser
+%{_libdir}/%{name}/collects/combinator-parser
+%{_libdir}/%{name}/collects/compiler
+%{_libdir}/%{name}/collects/config
+%{_libdir}/%{name}/collects/defaults
+%{_libdir}/%{name}/collects/deinprogramm
+%{_libdir}/%{name}/collects/dynext
+%{_libdir}/%{name}/collects/eopl
+%{_libdir}/%{name}/collects/errortrace
+%{_libdir}/%{name}/collects/ffi
+%{_libdir}/%{name}/collects/file
+%{_libdir}/%{name}/collects/framework
+%{_libdir}/%{name}/collects/frtime
+%{_libdir}/%{name}/collects/graphics
+%{_libdir}/%{name}/collects/help
+%{_libdir}/%{name}/collects/hierlist
+%{_libdir}/%{name}/collects/htdch
+%{_libdir}/%{name}/collects/htdp
+%{_libdir}/%{name}/collects/html
+%{_libdir}/%{name}/collects/icons
+%{_libdir}/%{name}/collects/info-domain
+%{_libdir}/%{name}/collects/lang
+%{_libdir}/%{name}/collects/launcher
+%{_libdir}/%{name}/collects/lazy
+%{_libdir}/%{name}/collects/make
+%{_libdir}/%{name}/collects/mrlib
+%{_libdir}/%{name}/collects/mzlib
+%{_libdir}/%{name}/collects/mzscheme
+%{_libdir}/%{name}/collects/net
+%{_libdir}/%{name}/collects/openssl
+%{_libdir}/%{name}/collects/parser-tools
+%{_libdir}/%{name}/collects/planet
+%{_libdir}/%{name}/collects/plot
+%{_libdir}/%{name}/collects/preprocessor
+%{_libdir}/%{name}/collects/profile
+%{_libdir}/%{name}/collects/profj
+%{_libdir}/%{name}/collects/r5rs
+%{_libdir}/%{name}/collects/r6rs
+%{_libdir}/%{name}/collects/readline
+%{_libdir}/%{name}/collects/redex
+%{_libdir}/%{name}/collects/rnrs
+%{_libdir}/%{name}/collects/s-exp
+%{_libdir}/%{name}/collects/scheme
+%{_libdir}/%{name}/collects/scribble
+%{_libdir}/%{name}/collects/scribblings
+%{_libdir}/%{name}/collects/scriblib
 %{_libdir}/%{name}/collects/setup
 %{_libdir}/%{name}/collects/sgl
 %{_libdir}/%{name}/collects/slatex
-%{_libdir}/%{name}/collects/slibinit
 %{_libdir}/%{name}/collects/srfi
 %{_libdir}/%{name}/collects/stepper
 %{_libdir}/%{name}/collects/string-constants
-%{_libdir}/%{name}/collects/syntax*
-%{_libdir}/%{name}/collects/p*
-%{_libdir}/%{name}/collects/o*
-%{_libdir}/%{name}/collects/n*
-%{_libdir}/%{name}/collects/mz*
-%{_libdir}/%{name}/collects/mrlib
-%{_libdir}/%{name}/collects/make
-%{_libdir}/%{name}/collects/l*
-%{_libdir}/%{name}/collects/i*
-%{_libdir}/%{name}/collects/hi*
-%{_libdir}/%{name}/collects/ht*
-%{_libdir}/%{name}/collects/graphics
-%{_libdir}/%{name}/collects/f*
-%{_libdir}/%{name}/collects/e*
-%{_libdir}/%{name}/collects/dynext
-%{_libdir}/%{name}/collects/compiler
-%{_libdir}/%{name}/collects/browser
-%{_libdir}/%{name}/collects/a*
-%{_libdir}/%{name}/bin
-%{_libdir}/%{name}/%{_lib}
-%{_libdir}/%{name}/include
+%{_libdir}/%{name}/collects/stxclass
+%{_libdir}/%{name}/collects/swindle
+%{_libdir}/%{name}/collects/syntax
+%{_libdir}/%{name}/collects/syntax-color
+%{_libdir}/%{name}/collects/test-box-recovery
+%{_libdir}/%{name}/collects/test-engine
+%{_libdir}/%{name}/collects/tests
+%{_libdir}/%{name}/collects/tex2page
+%{_libdir}/%{name}/collects/texpict
+%{_libdir}/%{name}/collects/trace
+%{_libdir}/%{name}/collects/typed
+%{_libdir}/%{name}/collects/typed-scheme
+%{_libdir}/%{name}/collects/version
+%{_libdir}/%{name}/collects/wxme
+%{_libdir}/%{name}/collects/xml
+%{_mandir}/man1/mzc.1*
 %{_mandir}/man1/mzscheme.1*
+%{_mandir}/man1/setup-plt.1*
 %{_mandir}/man1/tex2page.1*
 %{_libdir}/*.so
 
 %files games
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/games
+%attr(755,root,root) %{_bindir}/plt-games
 %{_libdir}/%{name}/collects/games
 
-%files help-desk
+%files docs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/help-desk
+%attr(755,root,root) %{_bindir}/plt-help
 %{_libdir}/%{name}/collects/help
-%{_libdir}/%{name}/collects/doc
-%{_mandir}/man1/help-desk.1*
+%{_libdir}/%{name}/collects/scribblings
+%{_datadir}/%{name}/doc
+%{_mandir}/man1/plt-help.1*
 
 %files webserver
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/web-server*
+%attr(755,root,root) %{_bindir}/plt-web-server*
 %{_libdir}/%{name}/collects/web-server
 
 %files slideshow
@@ -270,21 +298,25 @@ rm -rf $RPM_BUILD_ROOT
 
 %files mred
 %defattr(644,root,root,755)
-%doc notes/mred/*
+%doc doc/release-notes/mred/*
 %attr(755,root,root) %{_bindir}/mred
+%attr(755,root,root) %{_bindir}/mred-text
+%{_libdir}/%{name}/collects/embedded-gui
 %{_libdir}/%{name}/collects/mred
 %{_mandir}/man1/mred.1*
 
 %files drscheme
 %defattr(644,root,root,755)
-%doc notes/drscheme/* teachpack.history
+%doc doc/release-notes/{drscheme,teachpack}
 %attr(755,root,root) %{_bindir}/drscheme
 %{_libdir}/%{name}/collects/drscheme
-%{_libdir}/%{name}/teachpack
+%{_libdir}/%{name}/collects/gui-debugger
+%{_libdir}/%{name}/collects/macro-debugger
+%{_libdir}/%{name}/collects/teachpack
 %{_mandir}/man1/drscheme.1*
 
 %files devel
 %defattr(644,root,root,755)
 %{_libdir}/*.la
-%{_libdir}/*.o
+%{_libdir}/plt/*.o
 %{_includedir}/*