rpms/wings/devel wings.spec,1.2,1.3

[Gérard Milmeister (gemi)]

Author: gemi

Update of /cvs/extras/rpms/wings/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6182/devel

Modified Files:
	wings.spec 
Log Message:



Index: wings.spec
===================================================================
RCS file: /cvs/extras/rpms/wings/devel/wings.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wings.spec	18 May 2006 21:30:36 -0000	1.2
+++ wings.spec	8 Jun 2006 07:56:25 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           wings
 Version:        0.98.32b
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        3D Subdivision Modeler
 
 Group:          Applications/Multimedia
@@ -11,13 +11,10 @@
 Source2:	http://www.midcoast.com.au/~rgcoy/downloads/wingspov-0.98.28_v1.tgz
 Source3:	wings.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  erlang
 BuildRequires:	erlang-esdl-devel
 BuildRequires:	libGL-devel
 BuildRequires:	libGLU-devel
 BuildRequires:  desktop-file-utils
-Requires:	erlang
-Requires:	erlang-esdl
 
 %description
 Wings 3D is a subdivision modeler with an user interface that is easy
@@ -40,27 +37,58 @@
 cp %{SOURCE1} .
 tar zxf %{SOURCE2}
 
+%define erlangdir %{_libdir}/erlang-R10B
 
 %build
 # %%{?_smp_mflags} breaks the build
-make
+PATH=%{erlangdir}/bin:$PATH make
 
 
 %install
 %define wingsdir $RPM_BUILD_ROOT%{_libdir}/wings
 rm -rf $RPM_BUILD_ROOT
+
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
-mkdir -p %{wingsdir}
-cp -rf ebin %{wingsdir}
-cp -rf plugins %{wingsdir}
-cp -rf fonts %{wingsdir}
+mkdir -p %{wingsdir}/bin
+
+# copy the wings binaries
+mkdir -p %{wingsdir}/lib
+mkdir -p %{wingsdir}/lib/wings-%{version}
+cp -rf ebin %{wingsdir}/lib/wings-%{version}
+cp -rf plugins %{wingsdir}/lib/wings-%{version}
+cp -rf fonts %{wingsdir}/lib/wings-%{version}
+
+# copy the erlang kernel binaries
+cp -rf %{erlangdir}/lib/kernel* %{wingsdir}/lib
+rm -rf %{wingsdir}/lib/kernel*/{examples,include,src}
+
+# copy the erlang stdlib binaries
+cp -rf %{erlangdir}/lib/stdlib* %{wingsdir}/lib
+rm -rf %{wingsdir}/lib/stdlib*/{examples,include,src}
+
+# copy the esdl binaries
+cp -rf %{erlangdir}/lib/esdl* %{wingsdir}/lib
+rm -rf %{wingsdir}/lib/esdl*/{include,src,vsn}
+
+# copy erlang binaries and scripts
+cp -f %{erlangdir}/erts*/bin/{beam,child_setup,erlexec,inet_gethost} %{wingsdir}/bin
+cp -f %{erlangdir}/bin/start.boot %{wingsdir}/bin
+
 
 find $RPM_BUILD_ROOT -name '.cvsignore' | xargs rm -rf
 find $RPM_BUILD_ROOT -name 'README' | xargs rm -f
 
 cat > $RPM_BUILD_ROOT%{_bindir}/wings <<EOF
 #!/bin/sh
-exec erl -pa %{_libdir}/wings/ebin -run wings_start start_halt
+ROOTDIR=%{_libdir}/wings
+BINDIR=\$ROOTDIR/bin
+EMU=beam
+PROGNAME=wings
+export ROOTDIR
+export BINDIR
+export EMU
+export PROGNAME
+exec \$BINDIR/erlexec -noinput -run wings_start start_halt \$*
 EOF
 chmod 755 $RPM_BUILD_ROOT%{_bindir}/wings
 
@@ -108,6 +136,9 @@
 
 
 %changelog
+* Wed Jun  7 2006 Gerard Milmeister <gemi at bluewin.ch> - 0.98.32b-8
+- revert to use erlang R10B
+
 * Thu May 18 2006 Gerard Milmeister <gemi at bluewin.ch> - 0.98.32b-7
 - rebuilt for erlang R11B