Generate squeak-vm with jhconvert

3 files changed, 101 insertions, 48 deletions

diff --git a/0.84/platform/squeak-vm/SOURCES/squeak-vm-3.10.3-sugar-squeak-exclude-plugins.patch b/0.84/platform/squeak-vm/SOURCES/squeak-vm-3.10.3-sugar-squeak-exclude-plugins.patch
new file mode 100644
index 0000000..9499a51
--- /dev/null
+++ b/0.84/platform/squeak-vm/SOURCES/squeak-vm-3.10.3-sugar-squeak-exclude-plugins.patch
@@ -0,0 +1,17 @@
+--- squeak-vm-sugar-3.10.3/platforms/unix/config/configure.orig	2008-05-15 00:19:25.000000000 +0700
++++ squeak-vm-sugar-3.10.3/platforms/unix/config/configure	2008-11-16 01:44:12.000000000 +0600
+@@ -29554,7 +29554,7 @@
+ # -*- sh -*-
+ 
+ 
+-for ac_header in linux/fb.h
++for ac_header in remove_fb_support
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+--- squeak-vm-sugar-3.10.3/platforms/unix/src/plugins.ext.orig	2008-05-14 17:19:25.000000000 +0000
++++ squeak-vm-sugar-3.10.3/platforms/unix/src/plugins.ext	2009-01-12 10:18:26.000000000 +0000
+@@ -1,2 +1,2 @@
+ # Automatically generated makefile include for external plugins
+-EXTERNAL_PLUGINS = B3DAcceleratorPlugin Squeak3D ClipboardExtendedPlugin DBusPlugin SqueakFFIPrims FileCopyPlugin GStreamerPlugin ImmX11Plugin KedamaPlugin KedamaPlugin2 MIDIPlugin OggPlugin PseudoTTYPlugin RomePlugin UUIDPlugin AioPlugin UnixOSProcessPlugin XDisplayControlPlugin
++EXTERNAL_PLUGINS = Squeak3D ClipboardExtendedPlugin DBusPlugin GStreamerPlugin ImmX11Plugin KedamaPlugin KedamaPlugin2 MIDIPlugin OggPlugin RomePlugin UUIDPlugin AioPlugin
diff --git a/0.84/platform/squeak-vm/SOURCES/squeak-vm-3.10.3-sugar-squeak-makefile.patch b/0.84/platform/squeak-vm/SOURCES/squeak-vm-3.10.3-sugar-squeak-makefile.patch
new file mode 100644
index 0000000..5413afe
--- /dev/null
+++ b/0.84/platform/squeak-vm/SOURCES/squeak-vm-3.10.3-sugar-squeak-makefile.patch
@@ -0,0 +1,20 @@
+--- squeak-vm-sugar-3.10.3/platforms/unix/config/make.cfg.in.orig	2006-10-18 16:17:11.000000000 +0000
++++ squeak-vm-sugar-3.10.3/platforms/unix/config/make.cfg.in	2008-12-27 02:14:18.000000000 +0000
+@@ -65,7 +65,7 @@
+ mandir=		@mandir@
+ imgdir=		@imgdir@
+ plgdir=		@plgdir@
+-docdir=		$(prefix)/doc/squeak
++docdir=		@docdir@/squeak
+ 
+ SHELL=		@SHELL@
+ MKINSTALLDIRS=	$(SHELL) $(cfgdir)/mkinstalldirs
+--- olpc/platforms/unix/config/make.prg.in.orig	2003-08-07 02:44:58.000000000 +0000
++++ olpc/platforms/unix/config/make.prg.in	2009-01-09 09:00:04.000000000 +0000
+@@ -11,5 +11,5 @@
+ 		  $(LDFLAGS) $(XLDFLAGS) -export-dynamic -c -o
+ LINK		= $(LIBTOOL) --mode=link \
+ 		  $(CC) $(CFLAGS) $(XCFLAGS) \
+-		  $(LDFLAGS) $(XLDFLAGS) -export-dynamic -R$(libdir) -o
++		  $(LDFLAGS) $(XLDFLAGS) -export-dynamic -o
+ RANLIB		= :
diff --git a/0.84/platform/squeak-vm/SPECS/squeak-vm.spec b/0.84/platform/squeak-vm/SPECS/squeak-vm.spec
index b1e62d0..ee6f669 100644
--- a/0.84/platform/squeak-vm/SPECS/squeak-vm.spec
+++ b/0.84/platform/squeak-vm/SPECS/squeak-vm.spec
@@ -1,62 +1,78 @@
-Name:		squeak-vm
-Summary:	The Squeak virtual machine
-Version:	3.10.3
-Release:	1	
-Url:		http://squeakvm.org/unix
-License:	MIT
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-build
-Source:		%{name}-%{version}.tar.bz2
-Source1:	squeak-vm-rpmlintrc
-Group:		Development/Languages
-BuildRequires:	gawk
-BuildRequires:  xorg-x11-libX11-devel	
-BuildRequires:	xorg-x11-libXt-devel
-BuildRequires:	libvorbis-devel
-BuildRequires:	libtheora-devel
-BuildRequires:	speex-devel
-BuildRequires:	dbus-1-devel
-BuildRequires:	alsa-lib-devel
-BuildRequires:	pango-devel
-BuildRequires:	gstreamer-devel
-BuildRequires:  -post-build-checks
-ExclusiveArch:	%ix86
-%define         exclude FileCopyPlugin SqueakFFIPrims B3DAcceleratorPlugin PseudoTTYPlugin UnixOSProcessPlugin XDisplayControlPlugin
+# NOTE: Do not edit, file was generated by jhconvert
+
+Name: squeak-vm
+Version: 3.10.3
+Release: 7
+Summary: Sugar specific branch of Squeak
+License: Free with restrictions (http://www.squeak.org/download/license.html)
+Group: Development/Other
+Url: http://squeakvm.org/svn/squeak/branches/olpc/
+
+# svn export -r1969 http://squeakvm.org/svn/squeak/branches/olpc olpc
+Source: squeak-vm-3.10.3-20090219.tar.bz2
+
+Patch: squeak-vm-3.10.3-sugar-squeak-exclude-plugins.patch
+Patch1: squeak-vm-3.10.3-sugar-squeak-makefile.patch
+
+BuildRequires: alsa-devel  
+BuildRequires: dbus-1-devel  
+BuildRequires: freetype2-devel  
+BuildRequires: gstreamer-devel >= 0.10
+BuildRequires: xorg-x11-libX11-devel  
+BuildRequires: xorg-x11-libXext-devel  
+BuildRequires: xorg-x11-libXrender-devel  
+BuildRequires: xorg-x11-libXt-devel  
+BuildRequires: libogg-devel  
+BuildRequires: pango-devel  
+BuildRequires: pkgconfig  
+BuildRequires: libuuid-devel  
+BuildRequires: fdupes
+
+ExcludeArch: x86_64
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Squeak is a full-featured implementation of the Smalltalk programming
 language and environment based on (and largely compatible with) the original
-Smalltalk-80 system.
-
-This package contains just the Squeak virtual machine.  You will have
-to install it before you install Etoys.
+Smalltalk-80 system.  Squeak has very powerful 2- and 3-D graphics, sound,
+video, MIDI, animation and other multimedia capabilities -- and one of the
+most impressive development environments ever created.  It also includes a
+customisable framework for creating dynamic HTTP servers and interactively
+extensible Web sites.  The entire Squeak system is open source software,
+distributed freely with a liberal license.  See <http://Squeak.org>; for
+further information.
 
 %prep
-%setup -q
+%setup -q -n olpc
+%patch -p1
+%patch1 -p1
 
 %build
-./autogen.sh
-#mkdir bld
-cd bld
-CPPFLAGS=-DSUGAR ../platforms/unix/config/configure --without-gl --prefix=%{_prefix}
-%__make %{?jobs:-j%jobs}
+ln -s autogen.sh configure
+%configure  \
+	--disable-rpath \
+	--without-rfb \
+	--without-npsqueak \
+	--without-quartz \
+	--without-gl
+make 
 
 %install
-[ -n "%{buildroot}" -a "%{buildroot}" != "/" ] && rm -rf %{buildroot}/*
-cd bld
-make install ROOT=%{buildroot} docdir=%{_prefix}/share/doc/squeak
-for plugin in %{exclude} ; do
-  rm -f %{buildroot}%{_prefix}/lib/squeak/%{version}-%{minor}/$plugin
-done
+rm -rf %{buildroot}
+make  \
+	install \
+	ROOT=%{buildroot}
+%fdupes -s %{buildroot}
 
 %clean
-[ -n "%{buildroot}" -a "%{buildroot}" != "/" ] && rm -rf %{buildroot}/*
+rm -rf %{buildroot}
 
 %files
-%defattr(-, root, root)
-%{_prefix}/bin/squeak
-%{_prefix}/lib/squeak/
-%{_prefix}/share/man/man1/squeak.1.gz
-%{_prefix}/share/man/man1/inisqueak.1.gz
-%{_prefix}/share/doc/squeak/
-
-%changelog
\ No newline at end of file
+%defattr(-,root,root,-)
+%{_bindir}/*
+%{_libdir}/squeak
+%{_mandir}/man1/*
+%{_datadir}/doc/squeak
+
+%changelog
+