rpms/erlang-esdl/devel erlang-esdl.spec,1.2,1.3

[Gérard Milmeister (gemi)]

Author: gemi

Update of /cvs/extras/rpms/erlang-esdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6095/devel

Modified Files:
	erlang-esdl.spec 
Log Message:



Index: erlang-esdl.spec
===================================================================
RCS file: /cvs/extras/rpms/erlang-esdl/devel/erlang-esdl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- erlang-esdl.spec	18 May 2006 21:19:38 -0000	1.2
+++ erlang-esdl.spec	8 Jun 2006 07:52:37 -0000	1.3
@@ -1,19 +1,18 @@
 Name:           erlang-esdl
 Version:        0.95.0630
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Erlang OpenGL/SDL api and utilities
 
 Group:          Development/Libraries
 License:        Distributable
 URL:            http://esdl.sourceforge.net
 Source:		http://download.sourceforge.net/esdl/esdl-0.95.0630.src.tar.gz
-Patch0:		esdl-refc.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL-devel
 BuildRequires:	libGL-devel
 BuildRequires:	libGLU-devel
-BuildRequires:	erlang >= R11B
-Requires:	erlang >= R11B
+BuildRequires:	compat-erlang = R10B
+Requires:	compat-erlang = R10B
 Provides:	esdl = %{version}-%{release}
 
 
@@ -31,31 +30,32 @@
 Development files for ESDL.
 
 
+%define erlangdir %{_libdir}/erlang-R10B
+
 %prep
 %setup -q -n esdl-%{version}
-%patch0 -p1 -b .refc
 perl -pi -e 's|INSTALLDIR = |INSTALLDIR = \$(DESTDIR)|' Makefile
-perl -pi -e 's|^ERL_DIR.*|ERL_DIR:=%{_libdir}/erlang|' Makefile
+perl -pi -e 's|^ERL_DIR.*|ERL_DIR:=%{erlangdir}|' Makefile
 find . -name '*.c' -or -name '*.h' | xargs chmod 0644
 
 
 %build
-make %{?_smp_mflags}
+PATH=%{erlangdir}/bin:$PATH make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/erlang/lib
+mkdir -p $RPM_BUILD_ROOT%{erlangdir}/lib
 make DESTDIR=$RPM_BUILD_ROOT install
 chmod 0644 Readme
 find . -name '*.html' | xargs chmod 0644
-find $RPM_BUILD_ROOT%{_libdir}/erlang/lib -name 'Readme*' | xargs rm -f
-find $RPM_BUILD_ROOT%{_libdir}/erlang/lib -name 'license*' | xargs rm -f
-find $RPM_BUILD_ROOT%{_libdir}/erlang/lib -name '*.beam' | xargs chmod 0644
-find $RPM_BUILD_ROOT%{_libdir}/erlang/lib -name '*.hrl' | xargs chmod 0644
-find $RPM_BUILD_ROOT%{_libdir}/erlang/lib -name '*.erl' | xargs chmod 0644
-find $RPM_BUILD_ROOT%{_libdir}/erlang/lib -name doc | xargs rm -fr
-rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/esdl-%{version}/c_src
+find $RPM_BUILD_ROOT%{erlangdir}/lib -name 'Readme*' | xargs rm -f
+find $RPM_BUILD_ROOT%{erlangdir}/lib -name 'license*' | xargs rm -f
+find $RPM_BUILD_ROOT%{erlangdir}/lib -name '*.beam' | xargs chmod 0644
+find $RPM_BUILD_ROOT%{erlangdir}/lib -name '*.hrl' | xargs chmod 0644
+find $RPM_BUILD_ROOT%{erlangdir}/lib -name '*.erl' | xargs chmod 0644
+find $RPM_BUILD_ROOT%{erlangdir}/lib -name doc | xargs rm -fr
+rm -rf $RPM_BUILD_ROOT%{erlangdir}/lib/esdl-%{version}/c_src
 
 
 %clean
@@ -65,19 +65,22 @@
 %files
 %defattr(-,root,root,-)
 %doc Readme license.terms
-%{_libdir}/erlang/lib/esdl-%{version}
-%exclude %{_libdir}/erlang/lib/esdl-%{version}/include
-%exclude %{_libdir}/erlang/lib/esdl-%{version}/src
+%{erlangdir}/lib/esdl-%{version}
+%exclude %{erlangdir}/lib/esdl-%{version}/include
+%exclude %{erlangdir}/lib/esdl-%{version}/src
 
 
 %files devel
 %defattr(-,root,root,-)
 %doc doc/*.html
-%{_libdir}/erlang/lib/esdl-%{version}/include
-%{_libdir}/erlang/lib/esdl-%{version}/src
+%{erlangdir}/lib/esdl-%{version}/include
+%{erlangdir}/lib/esdl-%{version}/src
 
 
 %changelog
+* Wed Jun  7 2006 Gerard Milmeister <gemi at bluewin.ch> - 0.95.0630-7
+- revert to use erlang R10B
+
 * Thu May 18 2006 Gerard Milmeister <gemi at bluewin.ch> - 0.95.0630-6
 - rebuilt for erlang R11B-0